From ad285ec4c96ad03c110ce7024d62a82261fdeac9 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 12 Jul 2015 17:19:53 +0300
Subject: [PATCH] Icons for tabs.

--HG--
branch : feature
---
 src/app/tape/main.cpp                         |   2 +-
 src/app/tape/mapplication.cpp                 |   2 +-
 src/app/tape/share/resources/icon.qrc         |   5 --
 src/app/tape/share/resources/tapeicon.qrc     |   7 ++
 .../share/resources/tapeicon/16x16/info.png   | Bin 0 -> 857 bytes
 .../resources/tapeicon/16x16/measurement.png  | Bin 0 -> 467 bytes
 .../{icon => tapeicon}/64x64/logo.ico         | Bin
 .../{icon => tapeicon}/64x64/logo.png         | Bin
 src/app/tape/tape.pro                         |   6 +-
 src/app/tape/tmainwindow.cpp                  |  10 ++-
 src/app/tape/tmainwindow.h                    |   2 +
 src/app/tape/tmainwindow.ui                   |  84 +++++++++++++++++-
 12 files changed, 103 insertions(+), 15 deletions(-)
 delete mode 100644 src/app/tape/share/resources/icon.qrc
 create mode 100644 src/app/tape/share/resources/tapeicon.qrc
 create mode 100644 src/app/tape/share/resources/tapeicon/16x16/info.png
 create mode 100644 src/app/tape/share/resources/tapeicon/16x16/measurement.png
 rename src/app/tape/share/resources/{icon => tapeicon}/64x64/logo.ico (100%)
 rename src/app/tape/share/resources/{icon => tapeicon}/64x64/logo.png (100%)

diff --git a/src/app/tape/main.cpp b/src/app/tape/main.cpp
index cb13bcee6..8913df565 100644
--- a/src/app/tape/main.cpp
+++ b/src/app/tape/main.cpp
@@ -33,7 +33,7 @@
 
 int main(int argc, char *argv[])
 {
-    Q_INIT_RESOURCE(icon);
+    Q_INIT_RESOURCE(tapeicon);
 
     QT_REQUIRE_VERSION(argc, argv, "5.0.0");
 
diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp
index cece94815..dc48709ad 100644
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@@ -45,7 +45,7 @@ MApplication::MApplication(int &argc, char **argv)
     setOrganizationDomain(VER_COMPANYDOMAIN_STR);
     // Setting the Application version
     setApplicationVersion(APP_VERSION_STR);
-    setWindowIcon(QIcon(":/icon/64x64/logo.png"));
+    setWindowIcon(QIcon(":/tapeicon/64x64/logo.png"));
 
     const QString serverName = QCoreApplication::applicationName();
     QLocalSocket socket;
diff --git a/src/app/tape/share/resources/icon.qrc b/src/app/tape/share/resources/icon.qrc
deleted file mode 100644
index dfda1bb66..000000000
--- a/src/app/tape/share/resources/icon.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>icon/64x64/logo.png</file>
-    </qresource>
-</RCC>
diff --git a/src/app/tape/share/resources/tapeicon.qrc b/src/app/tape/share/resources/tapeicon.qrc
new file mode 100644
index 000000000..7374f884a
--- /dev/null
+++ b/src/app/tape/share/resources/tapeicon.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>tapeicon/64x64/logo.png</file>
+        <file>tapeicon/16x16/info.png</file>
+        <file>tapeicon/16x16/measurement.png</file>
+    </qresource>
+</RCC>
diff --git a/src/app/tape/share/resources/tapeicon/16x16/info.png b/src/app/tape/share/resources/tapeicon/16x16/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7fb9d586f87a5184ed018b3c9d2899e95a8818c
GIT binary patch
literal 857
zcmV-f1E&0mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0009ZNkl<ZcwSwS
ze`phD9LAr!dvi^+X_}_L(!^G&s~dGiDuKf2{&6sHST<yV;UE4{5e9P%1UE{f&LVDL
zDGW!8ty;%^v}GIX>T3R|KX5R$sbvmli)KGco7ydH+R#gSce%UQ_b%oTpW`{c9Pj7*
zeZIWMDT;!EE<_*i)N;9qqNuI1qE_T&mGDH+2yrAGMEF%8r0dB3S05ArQ53-!;QsO1
zNJh%s5D6C!_{;s<8|q18a}##F@)D^HRQN@K3rlI~_PLSYKf`n4E%=w&h@6#=`K!vx
zNofrhWf$Vh24)f)c%0O+q`I)VDu_UhuQ;8Sj$Ru5W6*9eF#c#~CX@ZJy3$*`MoX}e
zQjpGSXbL(Jc{_ln+D%AjRLrMjWE^hP_<dw<A$8!!-FQ2gxSo;eVNpO>EDIp9szTQd
zP)hOX{w*jdGV(V-DR>SDmWlZ9uYcfmI~LnogS&WnLvHnW+*o5%H7yUD&)9Uzg2(PH
zTQD^YXu6J7NkwI4Ddrc`HM*|1amRbF=U#4XAm+}h)ga%55hiHY6!|71;jqn1aP!(U
zIuGw2BC@OyUT{D&HW;H@Kv#Gh3R+;h_eTG<8|fP0aBhOMF2gX45YKUfrl|^e<fntV
zb107A9<9NW#Tj-Yfd`bV42MX-R;c3%5t3>~f|J1Bl|DOcE5DZYy@+s-R@3l$oMwYL
z?quJs;UWhY_6BQN+zn{Dfz$8pz>E6i@_q0;Q0sFcem{=tauIK~R1Fb9;JZ?(^}QwT
zm119U36g0U9bf;MPh(HdUtxt?gtU|d`<bxs^?EbGgb@9{_y4JfOP(i-sTQwG;7h%3
z6SgB09@tzYpsLgfIk|$_*#ur|uEtisYt%4|vrrVpa`&ZMgGWw{<~q8g^o#Febl}QE
z`qi~K?H_wUdoJImADtSd2akSB`@gwPr>3Uv#$vHO<`5IM{X;a?{(0X-;)4@E(s$n<
zq;DNOPv1FwkskVZn4bCaDxJ7_hcfV|$;rt*jImO3=IeRQ%*<4<Xl=}Iumd4h*D=qr
jI>tP~{BtN2N)~{p9SqYNJ-E*G00000NkvXXu0mjf)9at`

literal 0
HcmV?d00001

diff --git a/src/app/tape/share/resources/tapeicon/16x16/measurement.png b/src/app/tape/share/resources/tapeicon/16x16/measurement.png
new file mode 100644
index 0000000000000000000000000000000000000000..7577e9ccf1aa20bf303c5f96b83d7515160810ea
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002PP)t-s0001!
zU;xRM0F+?>`^NzL$N>N4z5n*T=&}G!EC82e0De>e%9j9*S^$z?0Et!rm0|#0Jpf-l
z0RPr{#*+ZoqyYce0RPeeRWtzIssR7c0RP{5+ou3sJOErg0A4)+UOWK*<Gqny0GMO|
z|M9)xtpMe+0RP^4|Im8>&jA18dhWUa@x1`wtN`k@0M()Z|J!=angGt50A4--#gYKg
zo&cF;08lRgRy6?JrvTQX0NJGg>b3y?)q4NV0G49_<gWm+=ViSB0004WQchC<K<3zH
z00001VoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ2MG;3Fgbe&
zq5uE@iAh93R2b7$j@J&tFc1W9F*UYRNTCyY@4dtSe-#!|h`sZ)qtoh$$U+YmX|bb9
zWa~oKC%#N8b|N?gLS%l~f-ucxQ(j8USNUQ>_o2k+Tqq?Bt{}e01yyuVR<zn&&9cR2
zX8gfML&p@$=a?Cy7CLWTxS`)LF5LA|8XNult$ES~_hOI#+ZS`w3JZ_L=gI&8002ov
JPDHLkV1oS(yPyC7

literal 0
HcmV?d00001

diff --git a/src/app/tape/share/resources/icon/64x64/logo.ico b/src/app/tape/share/resources/tapeicon/64x64/logo.ico
similarity index 100%
rename from src/app/tape/share/resources/icon/64x64/logo.ico
rename to src/app/tape/share/resources/tapeicon/64x64/logo.ico
diff --git a/src/app/tape/share/resources/icon/64x64/logo.png b/src/app/tape/share/resources/tapeicon/64x64/logo.png
similarity index 100%
rename from src/app/tape/share/resources/icon/64x64/logo.png
rename to src/app/tape/share/resources/tapeicon/64x64/logo.png
diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
index 9afca9cdb..046099a65 100644
--- a/src/app/tape/tape.pro
+++ b/src/app/tape/tape.pro
@@ -43,6 +43,9 @@ UI_DIR = uic
 # Suport subdirectories. Just better project code tree.
 include(tape.pri)
 
+RESOURCES += \
+    share/resources/tapeicon.qrc
+
 # Compilation will fail without this files after we added them to this section.
 OTHER_FILES += \
     share/resources/tape.rc \ # For Windows system.
@@ -161,6 +164,3 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
         }
     }
 }
-
-RESOURCES += \
-    share/resources/icon.qrc
diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp
index 5c91e65fb..7c378bab8 100644
--- a/src/app/tape/tmainwindow.cpp
+++ b/src/app/tape/tmainwindow.cpp
@@ -35,8 +35,9 @@ TMainWindow::TMainWindow(QWidget *parent)
       ui(new Ui::TMainWindow)
 {
     ui->setupUi(this);
-
     ui->tabWidget->setVisible(false);
+
+    SetupMenu();
 }
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -47,6 +48,13 @@ TMainWindow::~TMainWindow()
 
 //---------------------------------------------------------------------------------------------------------------------
 void TMainWindow::LoadFile(const QString &path)
+{
+    ui->labelToolTip->setVisible(false);
+    ui->tabWidget->setVisible(true);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void TMainWindow::SetupMenu()
 {
 
 }
diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h
index f0a4a44d8..3c6e82a28 100644
--- a/src/app/tape/tmainwindow.h
+++ b/src/app/tape/tmainwindow.h
@@ -50,6 +50,8 @@ public slots:
 private:
     Q_DISABLE_COPY(TMainWindow)
     Ui::TMainWindow *ui;
+
+    void SetupMenu();
 };
 
 #endif // TMAINWINDOW_H
diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui
index 0f6e5c191..c546ec9eb 100644
--- a/src/app/tape/tmainwindow.ui
+++ b/src/app/tape/tmainwindow.ui
@@ -6,13 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>531</width>
-    <height>406</height>
+    <width>742</width>
+    <height>520</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>TMainWindow</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="share/resources/tapeicon.qrc">
+    <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
+  </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout">
     <item alignment="Qt::AlignHCenter">
@@ -28,6 +32,10 @@
        <number>0</number>
       </property>
       <widget class="QWidget" name="tabMeasurements">
+       <attribute name="icon">
+        <iconset resource="share/resources/tapeicon.qrc">
+         <normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset>
+       </attribute>
        <attribute name="title">
         <string>Measuremnts</string>
        </attribute>
@@ -38,6 +46,10 @@
        </layout>
       </widget>
       <widget class="QWidget" name="tabInformation">
+       <attribute name="icon">
+        <iconset resource="share/resources/tapeicon.qrc">
+         <normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset>
+       </attribute>
        <attribute name="title">
         <string>Information</string>
        </attribute>
@@ -51,10 +63,37 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>531</width>
+     <width>742</width>
      <height>25</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menu_File">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="actionNew"/>
+    <addaction name="actionOpen"/>
+    <addaction name="separator"/>
+    <addaction name="actionSave"/>
+    <addaction name="actionSaveAs"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
+     <string>Window</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAboutQt"/>
+    <addaction name="actionAboutTape"/>
+   </widget>
+   <addaction name="menu_File"/>
+   <addaction name="menuWindow"/>
+   <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
@@ -65,8 +104,45 @@
    </attribute>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionOpen">
+   <property name="text">
+    <string>Open ...</string>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="text">
+    <string>Save</string>
+   </property>
+  </action>
+  <action name="actionSaveAs">
+   <property name="text">
+    <string>Save As ...</string>
+   </property>
+  </action>
+  <action name="actionQuit">
+   <property name="text">
+    <string>Quit</string>
+   </property>
+  </action>
+  <action name="actionAboutQt">
+   <property name="text">
+    <string>About &amp;Qt</string>
+   </property>
+  </action>
+  <action name="actionAboutTape">
+   <property name="text">
+    <string>About Tape</string>
+   </property>
+  </action>
+  <action name="actionNew">
+   <property name="text">
+    <string>New</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <resources>
+  <include location="share/resources/tapeicon.qrc"/>
+ </resources>
  <connections/>
 </ui>