Mercurial > zcinema / changeset

Binary file icons/zandemo.ico has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mkqrc.sh	Sun Aug 11 16:08:13 2013 +0300
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+QRCFILE=zandemo.qrc
+FILES=$(echo ./icons/*.* LICENSE)
+
+printf "" > $QRCFILE
+
+printf "<!DOCTYPE RCC>\n<RCC version=\"1.0\">\n<qresource>\n" >> $QRCFILE
+
+for f in $FILES; do
+	printf "\t<file>$f</file>\n" >> $QRCFILE
+done
+
+printf "</qresource>\n</RCC>\n" >> $QRCFILE

--- a/src/config.cpp	Sun Aug 11 14:04:03 2013 +0300
+++ b/src/config.cpp	Sun Aug 11 16:08:13 2013 +0300
@@ -51,12 +51,10 @@
 ConfigBox::ConfigBox (QWidget* parent, Qt::WindowFlags f) : QDialog (parent, f) {
 	ui = new Ui_ConfigBox;
 	ui->setupUi (this);
-	ui->updateProgress->hide();
-	ui->updateLabel->hide();
-
+	
 	initVersions();
 	initFromSettings();
-
+	
 	connect (ui->wad_add, SIGNAL (clicked()), this, SLOT (addPath()));
 	connect (ui->wad_pathEntry, SIGNAL (returnPressed()), this, SLOT (addPath()));
 	connect (ui->wad_findPath, SIGNAL (clicked()), this, SLOT (findPath()));

--- a/src/src.pro	Sun Aug 11 14:04:03 2013 +0300
+++ b/src/src.pro	Sun Aug 11 16:08:13 2013 +0300
@@ -1,8 +1,8 @@
 TARGET          = ../zandemo
 DEPENDPATH     += .
 INCLUDEPATH    += .
-# RC_FILE         = ../ldforge.rc
-# RESOURCES       = ../ldforge.qrc
+RC_FILE         = ../zandemo.rc
+RESOURCES       = ../zandemo.qrc
 RCC_DIR         = ./build/
 OBJECTS_DIR     = ./build/
 MOC_DIR         = ./build/

--- a/src/ui/configbox.ui	Sun Aug 11 14:04:03 2013 +0300
+++ b/src/ui/configbox.ui	Sun Aug 11 16:08:13 2013 +0300
@@ -19,6 +19,10 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../zandemo.qrc">
+    <normaloff>:/icons/zandemo.ico</normaloff>:/icons/zandemo.ico</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
@@ -132,7 +136,7 @@
             <x>0</x>
             <y>0</y>
             <width>516</width>
-            <height>213</height>
+            <height>220</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -164,7 +168,7 @@
             <x>0</x>
             <y>0</y>
             <width>516</width>
-            <height>213</height>
+            <height>220</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -210,70 +214,20 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QWidget" name="widget" native="true">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="updateLabel">
-          <property name="text">
-           <string>Checking for updates... </string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QProgressBar" name="updateProgress">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>16</height>
-           </size>
-          </property>
-          <property name="maximum">
-           <number>0</number>
-          </property>
-          <property name="value">
-           <number>-1</number>
-          </property>
-          <property name="textVisible">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../zandemo.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>wad_clear</sender>

--- a/src/ui/demoprompt.ui	Sun Aug 11 14:04:03 2013 +0300
+++ b/src/ui/demoprompt.ui	Sun Aug 11 16:08:13 2013 +0300
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../zandemo.qrc">
+    <normaloff>:/icons/zandemo.ico</normaloff>:/icons/zandemo.ico</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="demoNameLabel">
@@ -144,7 +148,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../zandemo.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>

--- a/src/ui/unknownversion.ui	Sun Aug 11 14:04:03 2013 +0300
+++ b/src/ui/unknownversion.ui	Sun Aug 11 16:08:13 2013 +0300
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>Unknown Zandronum Version</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../zandemo.qrc">
+    <normaloff>:/icons/zandemo.ico</normaloff>:/icons/zandemo.ico</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="m_description">
@@ -82,7 +86,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../zandemo.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>m_cancel</sender>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zandemo.qrc	Sun Aug 11 16:08:13 2013 +0300
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+	<file>./icons/zandemo.ico</file>
+	<file>LICENSE</file>
+</qresource>
+</RCC>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zandemo.rc	Sun Aug 11 16:08:13 2013 +0300
@@ -0,0 +1,1 @@
+IDI_ICON1 ICON DISCARDABLE "icons/zandemo.ico"
\ No newline at end of file