Merge "gui: move icon resources for the cfg editor to its subdirectory"
This commit is contained in:
@ -44,7 +44,7 @@ try:
|
|||||||
|
|
||||||
from xml.sax.saxutils import escape as toHtmlEscaped
|
from xml.sax.saxutils import escape as toHtmlEscaped
|
||||||
|
|
||||||
import frappy.gui.icon_rc_qt5
|
import frappy.gui.cfg_editor.icon_rc_qt5
|
||||||
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from PyQt4 import uic
|
from PyQt4 import uic
|
||||||
@ -57,7 +57,7 @@ except ImportError:
|
|||||||
QTreeWidget, QFileDialog, QTabBar, QAction, QMenu, QDialogButtonBox, QAbstractItemView, \
|
QTreeWidget, QFileDialog, QTabBar, QAction, QMenu, QDialogButtonBox, QAbstractItemView, \
|
||||||
QSpacerItem, QTreeView, QStandardItemModel, QStandardItem
|
QSpacerItem, QTreeView, QStandardItemModel, QStandardItem
|
||||||
|
|
||||||
import frappy.gui.icon_rc_qt4
|
import frappy.gui.cfg_editor.icon_rc_qt4
|
||||||
|
|
||||||
def toHtmlEscaped(s):
|
def toHtmlEscaped(s):
|
||||||
return Qt.escape(s)
|
return Qt.escape(s)
|
||||||
|
Reference in New Issue
Block a user