Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:23:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify UIs that were using the qrc

Browse source
This commit is contained in:
Atlante45 2014-04-11 11:59:23 -07:00
parent 18b364d9d9
commit 100c3f8da4
4 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/CMakeLists.txt
View file

@ -74,11 +74,6 @@ file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
# have qt5 wrap them and generate the appropriate header files # have qt5 wrap them and generate the appropriate header files
qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}") qt5_wrap_ui(QT_UI_HEADERS "${QT_UI_FILES}")
# grab the resource files in resources
file (GLOB_RECURSE QT_RESOURCE_FILES resources/*.qrc)
# have qt5 wrap them and generate the appropriate source files
qt5_add_resources(QT_RESOURCES "${QT_RESOURCE_FILES}")
# add them to the interface source files # add them to the interface source files
set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}") set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")

2
interface/src/ui/RunningScriptsWidget.cpp
View file

@ -77,7 +77,7 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list)
scriptName->setToolTip(list.at(i)); scriptName->setToolTip(list.at(i));
scriptName->setTextAlignment(Qt::AlignCenter); scriptName->setTextAlignment(Qt::AlignCenter);
QTableWidgetItem *closeIcon = new QTableWidgetItem; QTableWidgetItem *closeIcon = new QTableWidgetItem;
closeIcon->setIcon(QIcon(":/images/kill-script.svg")); closeIcon->setIcon(QIcon(Application::resourcesPath() + "/images/kill-script.svg"));
ui->runningScriptsTableWidget->setItem(i, 0, scriptName); ui->runningScriptsTableWidget->setItem(i, 0, scriptName);
ui->runningScriptsTableWidget->setItem(i, 1, closeIcon); ui->runningScriptsTableWidget->setItem(i, 1, closeIcon);

8
interface/ui/chatWindow.ui
View file

@ -100,8 +100,8 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/resources.qrc"> <iconset>
<normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset> <normaloff>../resources/images/close.svg</normaloff>../resources/images/close.svg</iconset>
</property> </property>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
@ -200,9 +200,7 @@
<tabstop>messagePlainTextEdit</tabstop> <tabstop>messagePlainTextEdit</tabstop>
<tabstop>messagesScrollArea</tabstop> <tabstop>messagesScrollArea</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../resources/resources.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>closeButton</sender> <sender>closeButton</sender>

16
interface/ui/runningScriptsWidget.ui
View file

@ -70,8 +70,8 @@ border-radius: 6px;</string>
<string>Reload All</string> <string>Reload All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/resources.qrc"> <iconset>
<normaloff>:/images/reload.svg</normaloff>:/images/reload.svg</iconset> <normaloff>../resources/images/reload.svg</normaloff>../resources/images/reload.svg</iconset>
</property> </property>
</widget> </widget>
<widget class="QPushButton" name="stopAllButton"> <widget class="QPushButton" name="stopAllButton">
@ -95,8 +95,8 @@ border-radius: 6px;</string>
<string>Stop All</string> <string>Stop All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/resources.qrc"> <iconset>
<normaloff>:/images/stop.svg</normaloff>:/images/stop.svg</iconset> <normaloff>../resources/images/stop.svg</normaloff>../resources/images/stop.svg</iconset>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="recentlyLoadedLabel"> <widget class="QLabel" name="recentlyLoadedLabel">
@ -166,8 +166,8 @@ border-radius: 6px;</string>
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../resources/resources.qrc"> <iconset>
<normaloff>:/images/close.svg</normaloff>:/images/close.svg</iconset> <normaloff>../resources/images/close.svg</normaloff>../resources/images/close.svg</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -241,8 +241,6 @@ border-radius: 6px;</string>
</property> </property>
</widget> </widget>
</widget> </widget>
<resources> <resources/>
<include location="../resources/resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>