refs #760, new 3D swift icons

* removed old icons
* new icons in CIcons class
* and as ico / icns (MAC)
This commit is contained in:
Klaus Basan
2016-09-09 20:28:26 +02:00
committed by Roland Winklmeier
parent 898b8e4078
commit ccb14b4d19
129 changed files with 317 additions and 372 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

View File

@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
//! [SwiftApplicationDemo]
CGuiApplication::highDpiScreenSupport();
QApplication qa(argc, argv);
CGuiApplication a("swift launcher", CGuiApplication::Laucher, CIcons::swift1024());
CGuiApplication a("swift launcher", CGuiApplication::Laucher, CIcons::swiftLauncher1024());
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
a.addParserOption({{"i", "installer"}, QCoreApplication::translate("main", "Installer setup."), "installer"});
a.parse();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

View File

@@ -1 +0,0 @@
IDI_ICON1 ICON DISCARDABLE "swift.ico"

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 KiB

View File

@@ -20,10 +20,11 @@ DEPENDPATH += . $$SourceRoot/src/blackmisc \
INCLUDEPATH += . $$SourceRoot/src
OTHER_FILES += *.qss *.ico *.rc
OTHER_FILES += *.qss *.ico *.rc *.icns
RESOURCES += swiftlauncher.qrc
RC_FILE = swift.rc
DISTFILES += swift.rc
RC_FILE = swiftlauncher.rc
DISTFILES += swiftlauncher.rc
ICON = swiftlauncher.icns
DESTDIR = $$DestRoot/bin

View File

@@ -1,7 +1,5 @@
<RCC>
<qresource prefix="/launcher">
<file>icons/swift256Launcher.png</file>
<file>icons/swift256Launcher.xcf</file>
<file>icons/swiftFrameless.png</file>
<file>icons/swiftNormal.png</file>
<file>icons/swiftFrameless100x162.png</file>

View File

@@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "swiftlauncher.ico"

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>365</width>
<height>625</height>
<width>400</width>
<height>650</height>
</rect>
</property>
<property name="windowTitle">
@@ -88,8 +88,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>355</width>
<height>301</height>
<width>390</width>
<height>326</height>
</rect>
</property>
<attribute name="label">
@@ -116,8 +116,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>355</width>
<height>301</height>
<width>390</width>
<height>326</height>
</rect>
</property>
<attribute name="label">
@@ -181,8 +181,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>341</width>
<height>309</height>
<width>390</width>
<height>326</height>
</rect>
</property>
<attribute name="label">
@@ -406,8 +406,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>355</width>
<height>301</height>
<width>390</width>
<height>326</height>
</rect>
</property>
<attribute name="label">
@@ -428,9 +428,6 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<zorder>fr_SoftwareUpdates</zorder>
<zorder>fr_SoftwareUpdates</zorder>
<zorder>fr_SoftwareUpdates</zorder>
</widget>
</item>
<item>
@@ -580,8 +577,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>355</width>
<height>301</height>
<width>390</width>
<height>326</height>
</rect>
</property>
<attribute name="label">
@@ -628,7 +625,7 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>355</width>
<width>390</width>
<height>112</height>
</rect>
</property>
@@ -660,7 +657,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<normaloff>:/own/icons/own/swift/swiftCartoonNova64.png</normaloff>:/own/icons/own/swift/swiftCartoonNova64.png</iconset>
<normaloff>:/own/icons/own/swift3D/sw3DOrange-256.png</normaloff>:/own/icons/own/swift3D/sw3DOrange-256.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -680,7 +677,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<normaloff>:/own/icons/own/swift/swiftCircle64.png</normaloff>:/own/icons/own/swift/swiftCircle64.png</iconset>
<normaloff>:/own/icons/own/swift3D/sw3DBlue-256.png</normaloff>:/own/icons/own/swift3D/sw3DBlue-256.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -700,7 +697,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<normaloff>:/own/icons/own/swift/swift64Database.png</normaloff>:/own/icons/own/swift/swift64Database.png</iconset>
<normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -720,7 +717,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="icon">
<iconset resource="../blackmisc/blackmisc.qrc">
<normaloff>:/own/icons/own/swift/swift64Database.png</normaloff>:/own/icons/own/swift/swift64Database.png</iconset>
<normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</normaloff>:/own/icons/own/swift3D/sw3DGreen-256.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -840,8 +837,8 @@ p, li { white-space: pre-wrap; }
</customwidget>
</customwidgets>
<resources>
<include location="../blackmisc/blackmisc.qrc"/>
<include location="swiftlauncher.qrc"/>
<include location="../blackmisc/blackmisc.qrc"/>
</resources>
<connections/>
<buttongroups>