From ff3cde3dfc18ed4214a8d5f79490469216ae2f71 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Thu, 28 Oct 2010 00:03:09 +0000 Subject: Toolbars: Marker, list, master(s) windows. Fixes for others. Some new style headers fixes. --- muse2/muse/widgets/lcombo.cpp | 13 ------------- muse2/muse/widgets/lcombo.h | 11 ++++++----- muse2/muse/widgets/noteinfo.cpp | 4 ++-- muse2/muse/widgets/pitchlabel.cpp | 4 ++-- muse2/muse/widgets/pitchlabel.h | 2 +- muse2/muse/widgets/poslabel.cpp | 4 ++-- muse2/muse/widgets/sigedit.cpp | 13 ++++++------- muse2/muse/widgets/sigedit.h | 4 ++-- muse2/muse/widgets/spinbox.cpp | 2 +- muse2/muse/widgets/spinbox.h | 2 +- muse2/muse/widgets/tb1.cpp | 16 ++++++++-------- muse2/muse/widgets/tb1.h | 4 ++-- 12 files changed, 33 insertions(+), 46 deletions(-) (limited to 'muse2/muse/widgets') diff --git a/muse2/muse/widgets/lcombo.cpp b/muse2/muse/widgets/lcombo.cpp index beb34255..2200cca7 100644 --- a/muse2/muse/widgets/lcombo.cpp +++ b/muse2/muse/widgets/lcombo.cpp @@ -36,16 +36,3 @@ LabelCombo::LabelCombo(const QString& txt, QWidget* parent, connect(box, SIGNAL(activated(int)), SIGNAL(activated(int))); } -void LabelCombo::insertItem(const QString& txt, int index) - { - box->insertItem(txt, index); - } - -void LabelCombo::clearFocus() -{ - box->clearFocus(); -} -void LabelCombo::setFocusPolicy ( Qt::FocusPolicy fp ) -{ - box->setFocusPolicy(fp); -} diff --git a/muse2/muse/widgets/lcombo.h b/muse2/muse/widgets/lcombo.h index a0adda7d..6b0441c0 100644 --- a/muse2/muse/widgets/lcombo.h +++ b/muse2/muse/widgets/lcombo.h @@ -31,16 +31,17 @@ class LabelCombo : public QWidget { void activated(int); public slots: - void clearFocus(); + void clearFocus() { box->clearFocus(); } + public: LabelCombo(const QString& label, QWidget* parent, const char* name=0); - void insertItem(const QString& txt, int index=-1); - void setCurrentItem(int i) { box->setCurrentItem(i); } + void addItem(const QString& txt, const QVariant & userData = QVariant()) { box->addItem(txt, userData); } + void insertItem(int index, const QString& txt, const QVariant & userData = QVariant()) { box->insertItem(index, txt, userData); } + void setCurrentIndex(int i) { box->setCurrentIndex(i); } //void setListBox(Q3ListBox* lb) { box->setListBox(lb); } // ddskrjo void setView(QAbstractItemView* v) { box->setModel(v->model()); box->setView(v); } // p4.0.3 - void setFocusPolicy ( Qt::FocusPolicy fp ); - + void setFocusPolicy ( Qt::FocusPolicy fp ) { box->setFocusPolicy(fp); } }; #endif diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp index e3d869e0..4e3a0304 100644 --- a/muse2/muse/widgets/noteinfo.cpp +++ b/muse2/muse/widgets/noteinfo.cpp @@ -8,8 +8,8 @@ #include "config.h" #include "noteinfo.h" -#include -#include +#include +#include #include "song.h" #include "globals.h" #include "posedit.h" diff --git a/muse2/muse/widgets/pitchlabel.cpp b/muse2/muse/widgets/pitchlabel.cpp index 66af63fb..50b63410 100644 --- a/muse2/muse/widgets/pitchlabel.cpp +++ b/muse2/muse/widgets/pitchlabel.cpp @@ -5,8 +5,8 @@ // (C) Copyright 2001 Werner Schweer (ws@seh.de) //========================================================= -#include -#include +#include +#include //Added by qt3to4: #include #include "pitchedit.h" diff --git a/muse2/muse/widgets/pitchlabel.h b/muse2/muse/widgets/pitchlabel.h index 1da83ecc..6372f711 100644 --- a/muse2/muse/widgets/pitchlabel.h +++ b/muse2/muse/widgets/pitchlabel.h @@ -8,7 +8,7 @@ #ifndef __PITCHLABEL_H__ #define __PITCHLABEL_H__ -#include +#include //--------------------------------------------------------- // PitchLabel diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index e71fea49..feb1486b 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include //Added by qt3to4: #include diff --git a/muse2/muse/widgets/sigedit.cpp b/muse2/muse/widgets/sigedit.cpp index 4d8c30b4..cbfa0cd1 100644 --- a/muse2/muse/widgets/sigedit.cpp +++ b/muse2/muse/widgets/sigedit.cpp @@ -9,12 +9,11 @@ #include #include -#include -#include -#include +#include +#include #include -#include -#include +#include +#include //Added by qt3to4: #include #include @@ -23,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include "sig.h" extern int mtcType; diff --git a/muse2/muse/widgets/sigedit.h b/muse2/muse/widgets/sigedit.h index f600c44f..89cc96bc 100644 --- a/muse2/muse/widgets/sigedit.h +++ b/muse2/muse/widgets/sigedit.h @@ -8,8 +8,8 @@ #ifndef __SIGEDIT_H__ #define __SIGEDIT_H__ -#include -#include +#include +#include //Added by qt3to4: #include #include diff --git a/muse2/muse/widgets/spinbox.cpp b/muse2/muse/widgets/spinbox.cpp index 6eed0ba6..de8f5593 100644 --- a/muse2/muse/widgets/spinbox.cpp +++ b/muse2/muse/widgets/spinbox.cpp @@ -4,7 +4,7 @@ // $Id: spinbox.cpp,v 1.1.2.3 2009/07/09 18:27:11 terminator356 Exp $ // (C) Copyright 2001 Werner Schweer (ws@seh.de) //========================================================= -#include +//#include //Added by qt3to4: #include #include diff --git a/muse2/muse/widgets/spinbox.h b/muse2/muse/widgets/spinbox.h index 6eaa2da7..8e391702 100644 --- a/muse2/muse/widgets/spinbox.h +++ b/muse2/muse/widgets/spinbox.h @@ -12,7 +12,7 @@ #ifndef __SPINBOX_H__ #define __SPINBOX_H__ -#include +#include //Added by qt3to4: #include diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp index a779760c..f65ce54b 100644 --- a/muse2/muse/widgets/tb1.cpp +++ b/muse2/muse/widgets/tb1.cpp @@ -188,10 +188,10 @@ Toolbar1::Toolbar1(QWidget* parent, int r, int q, bool sp) addWidget(new QLabel(tr("To"))); QComboBox* toList = new QComboBox; toList->setFixedHeight(22); - toList->addItem(tr("All Events"), 0); - toList->addItem(tr("Looped Ev."), CMD_RANGE_LOOP); - toList->addItem(tr("Selected Ev."), CMD_RANGE_SELECTED); - toList->addItem(tr("Looped+Sel."), CMD_RANGE_LOOP | CMD_RANGE_SELECTED); + toList->insertItem(0, tr("All Events")); + toList->insertItem(CMD_RANGE_LOOP, tr("Looped Ev.")); + toList->insertItem(CMD_RANGE_SELECTED, tr("Selected Ev.")); + toList->insertItem(CMD_RANGE_LOOP | CMD_RANGE_SELECTED, tr("Looped+Sel.")); addWidget(toList); connect(raster, SIGNAL(activated(int)), SLOT(_rasterChanged(int))); @@ -266,12 +266,12 @@ void Toolbar1::setRaster(int val) { for (unsigned i = 0; i < sizeof(rasterTable)/sizeof(*rasterTable); i++) { if (val == rasterTable[i]) { - raster->setCurrentItem(i); + raster->setCurrentIndex(i); return; } } printf("setRaster(%d) not defined\n", val); - raster->setCurrentItem(0); + raster->setCurrentIndex(0); } //--------------------------------------------------------- @@ -282,12 +282,12 @@ void Toolbar1::setQuant(int val) { for (unsigned i = 0; i < sizeof(quantTable)/sizeof(*quantTable); i++) { if (val == quantTable[i]) { - quant->setCurrentItem(i); + quant->setCurrentIndex(i); return; } } printf("setQuant(%d) not defined\n", val); - quant->setCurrentItem(0); + quant->setCurrentIndex(0); } //--------------------------------------------------------- diff --git a/muse2/muse/widgets/tb1.h b/muse2/muse/widgets/tb1.h index b330ee85..ced2e8b8 100644 --- a/muse2/muse/widgets/tb1.h +++ b/muse2/muse/widgets/tb1.h @@ -11,8 +11,8 @@ //#include //#include -#include // p4.0.4 -#include // +#include +#include class PosLabel; class PitchLabel; -- cgit v1.2.3