diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-18 16:58:09 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-11-18 16:58:09 +0000 |
commit | 2794fe038e5e3d200a9a1c549043580bb85149da (patch) | |
tree | 8326298a7223f439e1babae20ed28e6453a74a99 /muse2 | |
parent | 87d3692e1ad5a79a3608ffd361c637e44d9291c7 (diff) |
ported .ui widget to Qt4
Diffstat (limited to 'muse2')
-rw-r--r-- | muse2/ChangeLog | 2 | ||||
-rw-r--r-- | muse2/muse/mplugins/CMakeLists.txt | 5 | ||||
-rw-r--r-- | muse2/muse/mplugins/mrconfig.cpp | 7 | ||||
-rw-r--r-- | muse2/muse/mplugins/mrconfig.h | 27 | ||||
-rw-r--r-- | muse2/muse/mplugins/mrconfigbase.ui | 392 |
5 files changed, 222 insertions, 211 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index b05cd8de..c632dc75 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -2,7 +2,7 @@ - Updated build part README file - read it! Tell user to specify Release build type. (Tim) - Added printout of build type in top level cmake. (Tim) - Removed duplicate LASH detection in top level cmake. (Tim) - - Ported the following .ui widgets to Qt4: transformbase, itransformbase (Orcan) + - Ported the following .ui widgets to Qt4: transformbase, itransformbase, mrconfigbase (Orcan) 17.11.2010 - Removed a fix which cured graphic corruption for me in MusE-1. Not required now. (Tim) - Small change to Orcan's filedialog, re-enabled global button. (Tim) diff --git a/muse2/muse/mplugins/CMakeLists.txt b/muse2/muse/mplugins/CMakeLists.txt index da2ad902..242540a5 100644 --- a/muse2/muse/mplugins/CMakeLists.txt +++ b/muse2/muse/mplugins/CMakeLists.txt @@ -39,7 +39,9 @@ QT4_WRAP_CPP ( mplugins_mocs mittranspose.h midiitransform.h midifilterimpl.h mrconfig.h rhythm.h ) # QT4_WRAP_UI ( mplugins_uis transform.ui ) -QT4_WRAP_UI3 ( mplugins_uis midifilter.ui mrconfigbase.ui rhythmbase.ui ) + +QT4_WRAP_UI ( mplugins_UIC mrconfigbase.ui ) +QT4_WRAP_UI3 ( mplugins_uis midifilter.ui rhythmbase.ui ) # add_library ( mplugins SHARED add_library ( mplugins STATIC @@ -52,6 +54,7 @@ add_library ( mplugins STATIC random.cpp random.h ${mplugins_mocs} ${mplugins_uis} + ${mplugins_UIC} ) add_dependencies(mplugins widgets) diff --git a/muse2/muse/mplugins/mrconfig.cpp b/muse2/muse/mplugins/mrconfig.cpp index 38b67de3..290aba67 100644 --- a/muse2/muse/mplugins/mrconfig.cpp +++ b/muse2/muse/mplugins/mrconfig.cpp @@ -9,8 +9,7 @@ #include "pitchedit.h" #include "mrconfig.h" #include "globals.h" -#include <qcheckbox.h> -//Added by qt3to4: + #include <QCloseEvent> //--------------------------------------------------------- @@ -18,8 +17,8 @@ // Midi Remote Control Config //--------------------------------------------------------- -MRConfig::MRConfig(QWidget* parent, const char* name, Qt::WFlags fl) - : MRConfigBase(parent, name, fl) +MRConfig::MRConfig(QWidget* parent, Qt::WFlags fl) + : MRConfigBaseWidget(parent, fl) { b1->setChecked(rcEnable); sb1->setValue(rcStopNote); diff --git a/muse2/muse/mplugins/mrconfig.h b/muse2/muse/mplugins/mrconfig.h index 67b1976c..c58ddc19 100644 --- a/muse2/muse/mplugins/mrconfig.h +++ b/muse2/muse/mplugins/mrconfig.h @@ -9,15 +9,32 @@ #ifndef __MRCONFIG_H__ #define __MRCONFIG_H__ -#include "mrconfigbase.h" -//Added by qt3to4: -#include <QCloseEvent> +#include "ui_mrconfigbase.h" + +class QCloseEvent; +class QWidget; + +//--------------------------------------------------------- +// MRConfigBaseWidget +// Wrapper around Ui::MRConfigBase +//--------------------------------------------------------- + +class MRConfigBaseWidget : public QWidget, public Ui::MRConfigBase +{ + Q_OBJECT + + public: + MRConfigBaseWidget(QWidget *parent = 0, Qt::WFlags f = 0) : QWidget(parent, f) { setupUi(this); } +}; + + + //--------------------------------------------------------- // MRConfig //--------------------------------------------------------- -class MRConfig : public MRConfigBase { +class MRConfig : public MRConfigBaseWidget { Q_OBJECT virtual void closeEvent(QCloseEvent*); @@ -33,7 +50,7 @@ class MRConfig : public MRConfigBase { void setRcPlayNote(int); public: - MRConfig(QWidget* parent=0, const char* name=0, Qt::WFlags fl = 0); + MRConfig(QWidget* parent=0, Qt::WFlags fl = 0); }; #endif diff --git a/muse2/muse/mplugins/mrconfigbase.ui b/muse2/muse/mplugins/mrconfigbase.ui index 299f9183..c4d3b1d7 100644 --- a/muse2/muse/mplugins/mrconfigbase.ui +++ b/muse2/muse/mplugins/mrconfigbase.ui @@ -1,200 +1,192 @@ -<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> -<class>MRConfigBase</class> -<widget class="QWidget"> - <property name="name"> - <cstring>MRConfigBase</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>298</width> - <height>203</height> - </rect> - </property> - <property name="caption"> - <string>MusE: Midi Input Plugin: Remote Control</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QGroupBox"> - <property name="name"> - <cstring>GroupBox2</cstring> - </property> - <property name="title"> - <string>Activate</string> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>b1</cstring> - </property> - <property name="text"> - <string>On</string> - </property> - </widget> - </hbox> - </widget> - <widget class="QGroupBox"> - <property name="name"> - <cstring>GroupBox1</cstring> - </property> - <property name="title"> - <string>Actions</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <widget class="QLabel" row="0" column="0"> - <property name="name"> - <cstring>TextLabel1</cstring> - </property> - <property name="text"> - <string>Stop</string> - </property> - </widget> - <widget class="QLabel" row="1" column="0"> - <property name="name"> - <cstring>TextLabel2</cstring> - </property> - <property name="text"> - <string>Record</string> - </property> - </widget> - <widget class="QLabel" row="2" column="0"> - <property name="name"> - <cstring>TextLabel3</cstring> - </property> - <property name="text"> - <string>Goto Left Mark</string> - </property> - </widget> - <widget class="QLabel" row="3" column="0"> - <property name="name"> - <cstring>TextLabel4</cstring> - </property> - <property name="text"> - <string>Play</string> - </property> - </widget> - <widget class="PitchEdit" row="0" column="1"> - <property name="name"> - <cstring>sb1</cstring> - </property> - </widget> - <widget class="PitchEdit" row="1" column="1"> - <property name="name"> - <cstring>sb2</cstring> - </property> - </widget> - <widget class="PitchEdit" row="2" column="1"> - <property name="name"> - <cstring>sb3</cstring> - </property> - </widget> - <widget class="PitchEdit" row="3" column="1"> - <property name="name"> - <cstring>sb4</cstring> - </property> - </widget> - <spacer row="0" column="2"> - <property name="name" stdset="0"> - <cstring>Spacer1</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - <spacer row="1" column="2"> - <property name="name" stdset="0"> - <cstring>Spacer2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - <spacer row="2" column="2"> - <property name="name" stdset="0"> - <cstring>Spacer3</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - <spacer row="3" column="2"> - <property name="name" stdset="0"> - <cstring>Spacer4</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </grid> - </widget> - </vbox> -</widget> -<layoutdefaults spacing="6" margin="11"/> -<includes> - <include location="local" impldecl="in declaration">pitchedit.h</include> -</includes> -</UI> +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MRConfigBase</class> + <widget class="QWidget" name="MRConfigBase"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>298</width> + <height>249</height> + </rect> + </property> + <property name="windowTitle"> + <string>MusE: Midi Input Plugin: Remote Control</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QGroupBox" name="GroupBox2"> + <property name="title"> + <string>Activate</string> + </property> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>11</number> + </property> + <item> + <widget class="QCheckBox" name="b1"> + <property name="text"> + <string>On</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="GroupBox1"> + <property name="title"> + <string>Actions</string> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Stop</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel2"> + <property name="text"> + <string>Record</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="TextLabel3"> + <property name="text"> + <string>Goto Left Mark</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="TextLabel4"> + <property name="text"> + <string>Play</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="PitchEdit" name="sb1" native="true"/> + </item> + <item row="1" column="1"> + <widget class="PitchEdit" name="sb2" native="true"/> + </item> + <item row="2" column="1"> + <widget class="PitchEdit" name="sb3" native="true"/> + </item> + <item row="3" column="1"> + <widget class="PitchEdit" name="sb4" native="true"/> + </item> + <item row="0" column="2"> + <spacer name="Spacer1"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="2"> + <spacer name="Spacer2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="2"> + <spacer name="Spacer3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="2"> + <spacer name="Spacer4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>PitchEdit</class> + <extends>QWidget</extends> + <header>pitchedit.h</header> + </customwidget> + </customwidgets> + <includes> + <include location="local">pitchedit.h</include> + </includes> + <resources/> + <connections/> +</ui> |