Changeset 340

Timestamp:

07/10/10 01:00:00 (19 months ago)

Author:

antonbatenev.ya.ru

Message:

Начало приведения иконок к разным размерам, чтобы по ALT+TAB не происходило некрасивого растягивания

Location:

trunk

Files:

• form_date.cpp (modified) (1 diff)
• form_date_ui.cpp (modified) (1 diff)
• form_message_ui.cpp (modified) (1 diff)
• form_request_ui.cpp (modified) (1 diff)
• form_settings_ui.cpp (modified) (1 diff)
• icons/backward24.png (modified) (previous)
• icons/date128.png (added)
• icons/date16.png (added)
• icons/date22.png (added)
• icons/date24.png (added)
• icons/date32.png (added)
• icons/date48.png (added)
• icons/date64.png (added)
• icons/exit16.png (modified) (previous)
• icons/forward24.png (modified) (previous)
• icons/main.png (modified) (previous)
• icons/new128.png (added)
• icons/new16.png (modified) (previous)
• icons/new22.png (added)
• icons/new24.png (modified) (previous)
• icons/new32.png (added)
• icons/new48.png (added)
• icons/new64.png (added)
• icons/settings128.png (added)
• icons/settings16.png (modified) (previous)
• icons/settings22.png (added)
• icons/settings24.png (added)
• icons/settings32.png (added)
• icons/settings48.png (added)
• icons/settings64.png (added)
• icons/synchronize128.png (added)
• icons/synchronize16.png (modified) (previous)
• icons/synchronize22.png (added)
• icons/synchronize24.png (modified) (previous)
• icons/synchronize32.png (added)
• icons/synchronize48.png (added)
• icons/synchronize64.png (added)
• resource.qrc (modified) (4 diffs)
• version.h (modified) (1 diff)

trunk/form_date.cpp

@@ -10 +10 @@
 FormDate::FormDate  (QWidget* parent, bool as_read) : FormDateUI (parent)
 {
-        if (as_read == true)
-                setWindowIcon(QIcon(":/icons/markpatrialasread16.png"));
-        else
-                setWindowIcon(QIcon(":/icons/markpatrialasunread16.png"));
-
         QDateTime now = QDateTime::currentDateTime();
         m_selected_datetime = QDateTime(now.date(), QTime(now.time().hour(), now.time().minute()));

trunk/form_date_ui.cpp

@@ -15 +15 @@
 {
         setWindowTitle(QString::fromUtf8("дата / время"));
+
+        QIcon icon;
+        icon.addFile(":/icons/date16.png",  QSize(16, 16));
+        icon.addFile(":/icons/date22.png",  QSize(22, 22));
+        icon.addFile(":/icons/date24.png",  QSize(24, 24));
+        icon.addFile(":/icons/date32.png",  QSize(32, 32));
+        icon.addFile(":/icons/date48.png",  QSize(48, 48));
+        icon.addFile(":/icons/date64.png",  QSize(64, 64));
+        icon.addFile(":/icons/date128.png", QSize(128, 128));
+        setWindowIcon(icon);
 
         resize(315, 275);

trunk/form_message_ui.cpp

@@ -16 +16 @@
 {
         setWindowTitle(QString::fromUtf8("новое сообщение"));
-        setWindowIcon(QIcon(":/icons/new16.png"));
+
+        QIcon icon;
+        icon.addFile(":/icons/new16.png",  QSize(16, 16));
+        icon.addFile(":/icons/new22.png",  QSize(22, 22));
+        icon.addFile(":/icons/new24.png",  QSize(24, 24));
+        icon.addFile(":/icons/new32.png",  QSize(32, 32));
+        icon.addFile(":/icons/new48.png",  QSize(48, 48));
+        icon.addFile(":/icons/new64.png",  QSize(64, 64));
+        icon.addFile(":/icons/new128.png", QSize(128, 128));
+        setWindowIcon(icon);
 
         resize(750, 550);

trunk/form_request_ui.cpp

@@ -15 +15 @@
 {
         setWindowTitle(QString::fromUtf8("HTTP"));
-        setWindowIcon(QIcon(":/icons/synchronize16.png"));
+
+        QIcon icon;
+        icon.addFile(":/icons/synchronize16.png",  QSize(16, 16));
+        icon.addFile(":/icons/synchronize22.png",  QSize(22, 22));
+        icon.addFile(":/icons/synchronize24.png",  QSize(24, 24));
+        icon.addFile(":/icons/synchronize32.png",  QSize(32, 32));
+        icon.addFile(":/icons/synchronize48.png",  QSize(48, 48));
+        icon.addFile(":/icons/synchronize64.png",  QSize(64, 64));
+        icon.addFile(":/icons/synchronize128.png", QSize(128, 128));
+        setWindowIcon(icon);
 
         resize(400, 300);

trunk/form_settings_ui.cpp

@@ -17 +17 @@
 {
         setWindowTitle(QString::fromUtf8("настройки"));
-        setWindowIcon(QIcon(":/icons/settings16.png"));
+
+        QIcon icon;
+        icon.addFile(":/icons/settings16.png",  QSize(16, 16));
+        icon.addFile(":/icons/settings22.png",  QSize(22, 22));
+        icon.addFile(":/icons/settings24.png",  QSize(24, 24));
+        icon.addFile(":/icons/settings32.png",  QSize(32, 32));
+        icon.addFile(":/icons/settings48.png",  QSize(48, 48));
+        icon.addFile(":/icons/settings64.png",  QSize(64, 64));
+        icon.addFile(":/icons/settings128.png", QSize(128, 128));
+        setWindowIcon(icon);
 
         resize(549, 366);

trunk/resource.qrc

@@ -10 +10 @@
 
                 <file>icons/exit16.png</file>
-                <file>icons/synchronize16.png</file>
                 <file>icons/download16.png</file>
                 <file>icons/markallasread16.png</file>
@@ -17 +16 @@
                 <file>icons/markpatrialasunread16.png</file>
                 <file>icons/subscribe16.png</file>
-                <file>icons/settings16.png</file>
                 <file>icons/help16.png</file>
                 <file>icons/reply16.png</file>
-                <file>icons/new16.png</file>
                 <file>icons/unsubscribe16.png</file>
                 <file>icons/copy16.png</file>
@@ -31 +28 @@
                 <file>icons/nextunreadforum16.png</file>
 
-                <file>icons/synchronize24.png</file>
                 <file>icons/forward24.png</file>
                 <file>icons/backward24.png</file>
                 <file>icons/reply24.png</file>
                 <file>icons/draft24.png</file>
-                <file>icons/new24.png</file>
                 <file>icons/nextunreadarticle24.png</file>
                 <file>icons/nextunreadthread24.png</file>
@@ -93 +88 @@
                 <file>icons/google.translate.ico</file>
 
+                <file>icons/new16.png</file>
+                <file>icons/new22.png</file>
+                <file>icons/new24.png</file>
+                <file>icons/new32.png</file>
+                <file>icons/new48.png</file>
+                <file>icons/new64.png</file>
+                <file>icons/new128.png</file>
+
+                <file>icons/settings16.png</file>
+                <file>icons/settings22.png</file>
+                <file>icons/settings24.png</file>
+                <file>icons/settings32.png</file>
+                <file>icons/settings48.png</file>
+                <file>icons/settings64.png</file>
+                <file>icons/settings128.png</file>
+
+                <file>icons/date16.png</file>
+                <file>icons/date22.png</file>
+                <file>icons/date24.png</file>
+                <file>icons/date32.png</file>
+                <file>icons/date48.png</file>
+                <file>icons/date64.png</file>
+                <file>icons/date128.png</file>
+
+                <file>icons/synchronize16.png</file>
+                <file>icons/synchronize22.png</file>
+                <file>icons/synchronize24.png</file>
+                <file>icons/synchronize32.png</file>
+                <file>icons/synchronize48.png</file>
+                <file>icons/synchronize64.png</file>
+                <file>icons/synchronize128.png</file>
+
                 <file>translations/qt_ru_RU.qm</file>
 

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Втр Июл  6 11:49:17 MSD 2010"
+#define AVALON_DATE "Сбт Июл 10 00:53:00 MSD 2010"
 
 #endif