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 @@
-
-
- icon/64x64/logo.png
-
-
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 @@
+
+
+ tapeicon/64x64/logo.png
+ tapeicon/16x16/info.png
+ tapeicon/16x16/measurement.png
+
+
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 000000000..e7fb9d586
Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/16x16/info.png differ
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 000000000..7577e9ccf
Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/16x16/measurement.png differ
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 @@
0
0
- 531
- 406
+ 742
+ 520
TMainWindow
+
+
+ :/tapeicon/64x64/logo.png:/tapeicon/64x64/logo.png
+
-
@@ -28,6 +32,10 @@
0
+
+
+ :/tapeicon/16x16/measurement.png:/tapeicon/16x16/measurement.png
+
Measuremnts
@@ -38,6 +46,10 @@
+
+
+ :/tapeicon/16x16/info.png:/tapeicon/16x16/info.png
+
Information
@@ -51,10 +63,37 @@
0
0
- 531
+ 742
25
+
+
+
+
+
+
@@ -65,8 +104,45 @@
+
+
+ Open ...
+
+
+
+
+ Save
+
+
+
+
+ Save As ...
+
+
+
+
+ Quit
+
+
+
+
+ About &Qt
+
+
+
+
+ About Tape
+
+
+
+
+ New
+
+
-
+
+
+