|
From: Tapio V. <aa...@us...> - 2011-02-01 09:54:42
|
Module: editor
Branch: master
Commit: cabbacfbe06f3afa231c8f7cf0a13aa4ed9ac88d
Author: Tapio Vierros <tap...@gm...>
Date: Tue Feb 1 11:00:53 2011 +0200
Added a (dummy) getting started window.
---
CMakeLists.txt | 2 +-
editor.ui | 6 ++
editorapp.cc | 6 ++
editorapp.hh | 1 +
gettingstarted.hh | 12 ++++
gettingstarted.ui | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 208 insertions(+), 1 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d995f1..62b86a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ else(Phonon_FOUND)
endif(Phonon_FOUND)
# Headers that need MOC need to be defined separately
-file(GLOB MOC_HEADER_FILES "editorapp.hh" "notelabel.hh" "notegraphwidget.hh" "textcodecselector.hh")
+file(GLOB MOC_HEADER_FILES editorapp.hh notelabel.hh notegraphwidget.hh textcodecselector.hh gettingstarted.hh)
file(GLOB SOURCE_FILES "*.cc")
file(GLOB HEADER_FILES "*.hh")
diff --git a/editor.ui b/editor.ui
index da46a5a..70a0362 100644
--- a/editor.ui
+++ b/editor.ui
@@ -509,6 +509,7 @@
<property name="title">
<string>&Help</string>
</property>
+ <addaction name="actionGettingStarted"/>
<addaction name="actionWhatsThis"/>
<addaction name="separator"/>
<addaction name="actionAbout"/>
@@ -648,6 +649,11 @@
<string>Use anti-aliasing for the pitch visualization</string>
</property>
</action>
+ <action name="actionGettingStarted">
+ <property name="text">
+ <string>&Getting started</string>
+ </property>
+ </action>
</widget>
<resources/>
<connections/>
diff --git a/editorapp.cc b/editorapp.cc
index 37fec8f..48acf21 100644
--- a/editorapp.cc
+++ b/editorapp.cc
@@ -16,6 +16,7 @@
#include "notegraphwidget.hh"
#include "songwriter.hh"
#include "textcodecselector.hh"
+#include "gettingstarted.hh"
namespace {
static const QString PROJECT_SAVE_FILE_EXTENSION = "songproject"; // FIXME: Nice extension here
@@ -473,6 +474,11 @@ void EditorApp::on_actionLyricsFromClipboard_triggered()
// Help menu
+void EditorApp::on_actionGettingStarted_triggered()
+{
+ GettingStartedDialog dialog(this);
+ dialog.exec();
+}
void EditorApp::on_actionWhatsThis_triggered()
{
diff --git a/editorapp.hh b/editorapp.hh
index 9db3da7..cb5e675 100644
--- a/editorapp.hh
+++ b/editorapp.hh
@@ -80,6 +80,7 @@ public slots:
void on_actionLyricsFromClipboard_triggered();
// Help menu
+ void on_actionGettingStarted_triggered();
void on_actionWhatsThis_triggered();
void on_actionAbout_triggered();
diff --git a/gettingstarted.hh b/gettingstarted.hh
new file mode 100644
index 0000000..89154da
--- /dev/null
+++ b/gettingstarted.hh
@@ -0,0 +1,12 @@
+#include "ui_gettingstarted.h"
+
+class GettingStartedDialog: public QDialog, private Ui::GettingStarted
+{
+ Q_OBJECT
+public:
+ GettingStartedDialog(QWidget* parent = 0)
+ : QDialog(parent)
+ {
+ setupUi(this);
+ }
+};
diff --git a/gettingstarted.ui b/gettingstarted.ui
new file mode 100644
index 0000000..26bdd75
--- /dev/null
+++ b/gettingstarted.ui
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GettingStarted</class>
+ <widget class="QDialog" name="GettingStarted">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>640</width>
+ <height>480</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Getting Started</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="chkShowOnStartup">
+ <property name="text">
+ <string>&Show this window on application start</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="cmdClose">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QFrame" name="frame">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="font">
+ <font>
+ <pointsize>20</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>1.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="3">
+ <widget class="QCommandLinkButton" name="cmdMusicFile">
+ <property name="text">
+ <string>Insert a music file</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="font">
+ <font>
+ <pointsize>20</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>2.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCommandLinkButton" name="cmdLyricsFromFile">
+ <property name="text">
+ <string>Insert lyrics from a file</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="font">
+ <font>
+ <pointsize>20</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>3.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="font">
+ <font>
+ <pointsize>20</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>4.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="font">
+ <font>
+ <pointsize>20</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>5.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="4">
+ <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 row="1" column="3">
+ <widget class="QCommandLinkButton" name="cmdLyricsFromClipboard">
+ <property name="text">
+ <string>Insert lyrics from clipboard</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>or</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="3">
+ <widget class="QCommandLinkButton" name="cmdTimeLyrics">
+ <property name="text">
+ <string>Time the lyrics roughly while listening to the song</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="3">
+ <widget class="QCommandLinkButton" name="commandLinkButton">
+ <property name="text">
+ <string>Fine tune and fix wrongly guessed note positions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="3">
+ <widget class="QCommandLinkButton" name="commandLinkButton_2">
+ <property name="text">
+ <string>Export to your preferred format</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
|