chore: Rename files for main executables

DyssolTEC · Jul 14, 2024 · c8dac13 · c8dac13
1 parent cfe72ce
commit c8dac13
Show file tree

Hide file tree

Showing 56 changed files with 66 additions and 66 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 IF(BUILD_BINARIES)
 
   add_executable(DyssolC
-      ${CMAKE_SOURCE_DIR}/DyssolConsole/main.cpp
+      ${CMAKE_SOURCE_DIR}/DyssolCLI/main.cpp
   )
 
   set(libdyssolnames
@@ -109,7 +109,7 @@ IF(BUILD_BINARIES)
     INCLUDE_DIRECTORIES(${Graphviz_INCLUDE_DIR})
   ENDIF(Graphviz_FOUND)
 
-  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/DyssolMainWindow/config.ini.in" "${CMAKE_BINARY_DIR}/config.ini")
+  CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/DyssolGUI/config.ini.in" "${CMAKE_BINARY_DIR}/config.ini")
   INSTALL(FILES "${CMAKE_BINARY_DIR}/config.ini" DESTINATION ${INSTALL_CONFIG_PATH})
   INSTALL(FILES "${CMAKE_SOURCE_DIR}/Materials.dmdb" DESTINATION ${INSTALL_MATERIALDB_PATH})
 
@@ -119,7 +119,7 @@ IF(BUILD_BINARIES)
 
   ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/Units")
   ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/Solvers")
-  ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/DyssolMainWindow")
+  ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/DyssolGUI")
 
   SET(INSTALL_DOCS_PATH  ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/Dyssol/docs)
 

diff --git a/Dyssol.sln b/Dyssol.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.35013.160
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dyssol", "DyssolMainWindow\DyssolMainWindow.vcxproj", "{06FC09C8-3DBA-40B5-A5D2-5A33CD23F917}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dyssol", "DyssolGUI\DyssolGUI.vcxproj", "{06FC09C8-3DBA-40B5-A5D2-5A33CD23F917}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CacheHandler", "CacheHandler\CacheHandler.vcxproj", "{55AD8231-176F-4282-88FA-A0A0E71A51C6}"
 EndProject
@@ -84,7 +84,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Release", "Release", "{37D9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unit_Agglomerator", "Units\Agglomerator\Agglomerator.vcxproj", "{1BE27265-F358-42F3-B550-ADCAF0CB9FCC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DyssolC", "DyssolConsole\DyssolConsole.vcxproj", "{1641EA84-6364-4CAF-AB4F-8BFB995C0B48}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DyssolC", "DyssolCLI\DyssolCLI.vcxproj", "{1641EA84-6364-4CAF-AB4F-8BFB995C0B48}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Unit_HeatExchanger", "Units\HeatExchanger\HeatExchanger.vcxproj", "{A9D881A3-3E9A-46C4-B743-85C71BAE7BC9}"
 EndProject

diff --git a/DyssolConsole/DyssolConsole.vcxproj → DyssolCLI/DyssolCLI.vcxproj b/DyssolConsole/DyssolConsole.vcxproj → DyssolCLI/DyssolCLI.vcxproj
diff --git a/DyssolConsole/DyssolConsole.vcxproj.filters → DyssolCLI/DyssolCLI.vcxproj.filters b/DyssolConsole/DyssolConsole.vcxproj.filters → DyssolCLI/DyssolCLI.vcxproj.filters
diff --git a/DyssolConsole/main.cpp → DyssolCLI/main.cpp b/DyssolConsole/main.cpp → DyssolCLI/main.cpp
diff --git a/DyssolMainWindow/AboutWindow.cpp → DyssolGUI/AboutWindow.cpp b/DyssolMainWindow/AboutWindow.cpp → DyssolGUI/AboutWindow.cpp
diff --git a/DyssolMainWindow/AboutWindow.h → DyssolGUI/AboutWindow.h b/DyssolMainWindow/AboutWindow.h → DyssolGUI/AboutWindow.h
diff --git a/DyssolMainWindow/AboutWindow.ui → DyssolGUI/AboutWindow.ui b/DyssolMainWindow/AboutWindow.ui → DyssolGUI/AboutWindow.ui
diff --git a/DyssolMainWindow/CMakeLists.txt → DyssolGUI/CMakeLists.txt b/DyssolMainWindow/CMakeLists.txt → DyssolGUI/CMakeLists.txt
@@ -21,7 +21,7 @@ MACRO(SUBDIRLIST result curdir)
 ENDMACRO()
 
 set(DyssolGUInames
-	"DyssolMainWindow"
+	"DyssolGUI"
 	"GUIDialogs"
 	"GUIWidgets"
 )

diff --git a/DyssolMainWindow/Dyssol.cpp → DyssolGUI/Dyssol.cpp b/DyssolMainWindow/Dyssol.cpp → DyssolGUI/Dyssol.cpp
diff --git a/DyssolMainWindow/Dyssol.h → DyssolGUI/Dyssol.h b/DyssolMainWindow/Dyssol.h → DyssolGUI/Dyssol.h
diff --git a/DyssolMainWindow/Dyssol.rc → DyssolGUI/Dyssol.rc b/DyssolMainWindow/Dyssol.rc → DyssolGUI/Dyssol.rc
diff --git a/DyssolMainWindow/Dyssol.ui → DyssolGUI/Dyssol.ui b/DyssolMainWindow/Dyssol.ui → DyssolGUI/Dyssol.ui
diff --git a/DyssolMainWindow/DyssolMainWindow.vcxproj → DyssolGUI/DyssolGUI.vcxproj b/DyssolMainWindow/DyssolMainWindow.vcxproj → DyssolGUI/DyssolGUI.vcxproj
diff --git a/...inWindow/DyssolMainWindow.vcxproj.filters → DyssolGUI/DyssolGUI.vcxproj.filters b/...inWindow/DyssolMainWindow.vcxproj.filters → DyssolGUI/DyssolGUI.vcxproj.filters
diff --git a/...lMainWindow/DyssolMainWindow.vcxproj.user → DyssolGUI/DyssolGUI.vcxproj.user b/...lMainWindow/DyssolMainWindow.vcxproj.user → DyssolGUI/DyssolGUI.vcxproj.user
diff --git a/DyssolMainWindow/Resources.qrc → DyssolGUI/Resources.qrc b/DyssolMainWindow/Resources.qrc → DyssolGUI/Resources.qrc
diff --git a/DyssolMainWindow/Resources/Icon.ico → DyssolGUI/Resources/Icon.ico b/DyssolMainWindow/Resources/Icon.ico → DyssolGUI/Resources/Icon.ico
diff --git a/DyssolMainWindow/Resources/WinIcon.png → DyssolGUI/Resources/WinIcon.png b/DyssolMainWindow/Resources/WinIcon.png → DyssolGUI/Resources/WinIcon.png
diff --git a/DyssolMainWindow/SaveLoadThread.cpp → DyssolGUI/SaveLoadThread.cpp b/DyssolMainWindow/SaveLoadThread.cpp → DyssolGUI/SaveLoadThread.cpp
diff --git a/DyssolMainWindow/SaveLoadThread.h → DyssolGUI/SaveLoadThread.h b/DyssolMainWindow/SaveLoadThread.h → DyssolGUI/SaveLoadThread.h
diff --git a/DyssolMainWindow/config.ini → DyssolGUI/config.ini b/DyssolMainWindow/config.ini → DyssolGUI/config.ini
diff --git a/DyssolMainWindow/config.ini.in → DyssolGUI/config.ini.in b/DyssolMainWindow/config.ini.in → DyssolGUI/config.ini.in
diff --git a/DyssolMainWindow/main.cpp → DyssolGUI/main.cpp b/DyssolMainWindow/main.cpp → DyssolGUI/main.cpp
diff --git a/DyssolMainWindow/resource.h → DyssolGUI/resource.h b/DyssolMainWindow/resource.h → DyssolGUI/resource.h
diff --git a/DyssolInstallers/Scripts/Main.iss b/DyssolInstallers/Scripts/Main.iss
@@ -50,7 +50,7 @@ OutputBaseFilename={#MyAppName} {#MyAppVersion} setup
 #endif
 OutputDir={#SolutionDir}\DyssolInstallers\Installers
 LicenseFile={#SolutionDir}\LICENSE
-SetupIconFile={#SolutionDir}\DyssolMainWindow\Resources\Icon.ico
+SetupIconFile={#SolutionDir}\DyssolGUI\Resources\Icon.ico
 WizardImageFile={#SolutionDir}\DyssolInstallers\Data\WizardImageFile.bmp
 WizardSmallImageFile={#SolutionDir}\DyssolInstallers\Data\WizardSmallImageFile.bmp
 DisableStartupPrompt=False

diff --git a/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui b/GUIDialogs/CalculationSequenceEditor/CalculationSequenceEditor.ui
@@ -14,7 +14,7 @@
       <string>Calculation sequence</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout">
@@ -204,7 +204,7 @@
     <tabstop>buttonOk</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections>
     <connection>

diff --git a/GUIDialogs/CompoundsManager/CompoundsManager.ui b/GUIDialogs/CompoundsManager/CompoundsManager.ui
@@ -14,7 +14,7 @@
       <string>Used compounds</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <property name="autoFillBackground">
@@ -237,7 +237,7 @@
     <tabstop>pushButtonCancel</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui b/GUIDialogs/DustFormationTesterTab/DustFormationTesterTab.ui
@@ -14,7 +14,7 @@
    <string>Dust formation tendency</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="1,4">
@@ -348,7 +348,7 @@ Wet bulk</string>
   <tabstop>listWidgetUnits</tabstop>
  </tabstops>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui b/GUIDialogs/FlowsheetEditor/FlowsheetEditor.ui
@@ -14,7 +14,7 @@
       <string>CFlowsheetEditor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -661,7 +661,7 @@
     <tabstop>buttonRemoveListValue</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui b/GUIDialogs/FlowsheetEditor/FlowsheetViewer.ui
@@ -14,7 +14,7 @@
    <string>Flowsheet</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QGridLayout" name="mainLayout">
@@ -132,7 +132,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/GridEditor/DimensionParameters.ui b/GUIDialogs/GridEditor/DimensionParameters.ui
@@ -14,7 +14,7 @@
       <string>CDimensionParameters</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,1">
@@ -304,7 +304,7 @@
     <tabstop>tableGrid</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/GridEditor/GridEditor.ui b/GUIDialogs/GridEditor/GridEditor.ui
@@ -14,7 +14,7 @@
       <string>Grid specification</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -171,7 +171,7 @@
     <tabstop>listDims</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/HoldupsEditor/HoldupsEditor.ui b/GUIDialogs/HoldupsEditor/HoldupsEditor.ui
@@ -14,7 +14,7 @@
       <string>Holdups editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout" stretch="1,4">
@@ -134,7 +134,7 @@
     <tabstop>holdupsList</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui b/GUIDialogs/MaterialsDatabaseTab/CorrelationEditor.ui
@@ -14,7 +14,7 @@
       <string>CCorrelationEditor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
@@ -237,7 +237,7 @@
     <tabstop>tableParams</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui b/GUIDialogs/MaterialsDatabaseTab/DescriptionEditor.ui
@@ -14,7 +14,7 @@
    <string>Description</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -36,7 +36,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui b/GUIDialogs/MaterialsDatabaseTab/MaterialsDatabaseTab.ui
@@ -17,7 +17,7 @@
       <string>Compounds editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout_2">
@@ -1152,7 +1152,7 @@
     <tabstop>labelCompound1</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui b/GUIDialogs/MaterialsDatabaseTab/PropertyAdder.ui
@@ -14,7 +14,7 @@
    <string>Add property</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../DyssolMainWindow/Resources.qrc">
+   <iconset resource="../../DyssolGUI/Resources.qrc">
     <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -210,7 +210,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="../../DyssolMainWindow/Resources.qrc"/>
+  <include location="../../DyssolGUI/Resources.qrc"/>
  </resources>
  <connections>
   <connection>

diff --git a/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui b/GUIDialogs/MaterialsDatabaseTab/PropertyEditor.ui
@@ -14,7 +14,7 @@
       <string>Dependent property editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,0,1,0" columnstretch="1,0">
@@ -395,7 +395,7 @@
     <tabstop>lineCalcVal</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui b/GUIDialogs/ModulesManagerTab/ModulesManagerTab.ui
@@ -14,7 +14,7 @@
       <string>Models manager</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,3">
@@ -178,7 +178,7 @@
     <tabstop>tableModels</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/OptionsEditor/OptionsEditor.ui b/GUIDialogs/OptionsEditor/OptionsEditor.ui
@@ -32,7 +32,7 @@
       <string>Options</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <property name="sizeGripEnabled">
@@ -1162,7 +1162,7 @@
     <tabstop>checkBoxSplitFile</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections>
     <connection>

diff --git a/GUIDialogs/PhasesEditor/PhasesEditor.ui b/GUIDialogs/PhasesEditor/PhasesEditor.ui
@@ -14,7 +14,7 @@
       <string>Phases editor</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QGridLayout" name="gridLayout">
@@ -118,7 +118,7 @@
     <tabstop>pushButtonCancel</tabstop>
   </tabstops>
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>
diff --git a/GUIDialogs/SettingsEditor/SettingsEditor.ui b/GUIDialogs/SettingsEditor/SettingsEditor.ui
@@ -14,7 +14,7 @@
       <string>Settings</string>
     </property>
     <property name="windowIcon">
-      <iconset resource="../../DyssolMainWindow/Resources.qrc">
+      <iconset resource="../../DyssolGUI/Resources.qrc">
         <normaloff>:/Icons/WinIcon</normaloff>:/Icons/WinIcon</iconset>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -201,8 +201,8 @@
   </widget>
   <layoutdefault spacing="6" margin="11" />
   <resources>
-    <include location="../../DyssolMainWindow/Resources.qrc" />
-    <include location="../../DyssolMainWindow/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
+    <include location="../../DyssolGUI/Resources.qrc" />
   </resources>
   <connections />
 </ui>