TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename obsolete tq methods to standard names

Browse Source 
(cherry picked from commit c18386d69b)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 8808df134d
commit 17a246001d
69 changed files with 745 additions and 745 deletions
Show Stats Download Patch File Download Diff File

16
src/base/LayoutEngine.h
Unescape View File

@ -31,7 +31,7 @@ class TimeSignature;
/**
* Base classes for tqlayout engines. The intention is that
* Base classes for layout engines. The intention is that
* different sorts of renderers (piano-roll, score etc) can be
* implemented by simply plugging different implementations
* of Staff and LayoutEngine into a single view class.
@ -58,9 +58,9 @@ public:
timeT endTime = 0) = 0;
/**
* Precomputes tqlayout data for a single staff, updating any
* Precomputes layout data for a single staff, updating any
* internal data stores associated with that staff and updating
* any tqlayout-related properties in the events on the staff's
* any layout-related properties in the events on the staff's
* segment.
*
* If startTime == endTime, act on the whole staff; otherwise only
@ -71,10 +71,10 @@ public:
timeT endTime = 0) = 0;
/**
* Computes any tqlayout data that may depend on the results of
* Computes any layout data that may depend on the results of
* scanning more than one staff. This may mean doing most of
* the tqlayout (likely for horizontal tqlayout) or nothing at all
* (likely for vertical tqlayout).
* the layout (likely for horizontal layout) or nothing at all
* (likely for vertical layout).
*
* If startTime == endTime, act on the whole staff; otherwise only
* the given section.
@ -97,9 +97,9 @@ public:
virtual ~HorizontalLayoutEngine();
/**
* Sets a page width for the tqlayout.
* Sets a page width for the layout.
*
* A tqlayout implementation does not have to use this. Some might
* A layout implementation does not have to use this. Some might
* use it (for example) to ensure that bar lines fall precisely at
* the right-hand margin of each page. The computed x-coordinates
* will still require to be wrapped into lines by the staff or

8
src/base/ViewElement.h
Unescape View File

@ -53,7 +53,7 @@ public:
/**
* Returns the X coordinate of the element, as computed by the
* tqlayout. This is not the coordinate of the associated canvas
* layout. This is not the coordinate of the associated canvas
* item.
*
* @see getCanvasX()
@ -62,7 +62,7 @@ public:
/**
* Returns the Y coordinate of the element, as computed by the
* tqlayout. This is not the coordinate of the associated canvas
* layout. This is not the coordinate of the associated canvas
* item.
*
* @see getCanvasY()
@ -70,13 +70,13 @@ public:
virtual double getLayoutY() const { return m_layoutY; }
/**
* Sets the X coordinate which was computed by the tqlayout engine
* Sets the X coordinate which was computed by the layout engine
* @see getLayoutX()
*/
virtual void setLayoutX(double x) { m_layoutX = x; }
/**
* Sets the Y coordinate which was computed by the tqlayout engine
* Sets the Y coordinate which was computed by the layout engine
* @see getLayoutY()
*/
virtual void setLayoutY(double y) { m_layoutY = y; }

2
src/commands/edit/PasteEventsCommand.cpp
Unescape View File

@ -54,7 +54,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
{
if (pasteType != OpenAndPaste) {
// paste clef or key -> retqlayout to end
// paste clef or key -> relayout to end
if (clipboard->isSingleSegment()) {

8
src/document/io/LilyPondExporter.cpp
Unescape View File

@ -452,7 +452,7 @@ LilyPondExporter::write()
// LilyPond \header block
// set indention level to make future changes to horizontal tqlayout less
// set indention level to make future changes to horizontal layout less
// tedious, ++col to indent a new level, --col to de-indent
int col = 0;
@ -583,7 +583,7 @@ LilyPondExporter::write()
// bind staffs with or without staff group bracket
str << indent(col) // indent
<< "<<" << " s4 " << ">>" << std::endl;
str << indent(col) << "\\tqlayout { }" << std::endl;
str << indent(col) << "\\layout { }" << std::endl;
str << indent(--col) << "}" << std::endl;
return true;
}
@ -1253,8 +1253,8 @@ LilyPondExporter::write()
str << std::endl << indent(--col) << ">> % notes" << std::endl << std::endl; // indent-
// str << std::endl << indent(col) << ">> % global wrapper" << std::endl;
// write \tqlayout block
str << indent(col) << "\\tqlayout { }" << std::endl;
// write \layout block
str << indent(col) << "\\layout { }" << std::endl;
// write initial tempo in Midi block, if user wishes (added per user request...
// makes debugging the .ly file easier because fewer "noisy" errors are

4
src/gui/application/main.cpp
Unescape View File

@ -246,7 +246,7 @@ and Events (our basic music element). To help lift the ambiguity,
and time this corresponds to, that kind of stuff. (In the
Notation and Matrix views, the LinedStaff calculates mappings
between coordinates and staff lines: the former is especially
complicated because of its support for page tqlayout.)\n
complicated because of its support for page layout.)\n
-# The canvas view transmits this kind of info as a signal, which is
connected to a slot in the parent EditView.
-# The EditView delegates action to the current tool.\n
@ -260,7 +260,7 @@ which "wraps" the complexity into simple calls and performs all the
hidden tasks.
The EditView also maintains (obviously) its visual appearance with the
tqlayout classes, applying them when appropriate.
layout classes, applying them when appropriate.
\section sequencer Sequencer

46
src/gui/configuration/AudioConfigurationPage.cpp
Unescape View File

@ -78,7 +78,7 @@ AudioConfigurationPage::AudioConfigurationPage(
m_cfg->setGroup(SequencerOptionsConfigGroup);
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 7, 2, 10, 5);
TQLabel *label = 0;
@ -86,17 +86,17 @@ AudioConfigurationPage::AudioConfigurationPage(
m_cfg->setGroup(GeneralOptionsConfigGroup);
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addWidget(new TQLabel(i18n("Audio preview scale"),
layout->addWidget(new TQLabel(i18n("Audio preview scale"),
frame), row, 0);
m_previewStyle = new KComboBox(frame);
m_previewStyle->insertItem(i18n("Linear - easier to see loud peaks"));
m_previewStyle->insertItem(i18n("Meter scaling - easier to see quiet activity"));
m_previewStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("audiopreviewstyle", 1));
tqlayout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
layout->addMultiCellWidget(m_previewStyle, row, row, 1, 2);
++row;
#ifdef HAVE_LIBJACK
@ -107,14 +107,14 @@ AudioConfigurationPage::AudioConfigurationPage(
m_audioRecFormat->insertItem(i18n("16-bit PCM WAV format (smaller files)"));
m_audioRecFormat->insertItem(i18n("32-bit float WAV format (higher quality)"));
m_audioRecFormat->setCurrentItem(m_cfg->readUnsignedNumEntry("audiorecordfileformat", 1));
tqlayout->addWidget(label, row, 0);
tqlayout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
layout->addWidget(label, row, 0);
layout->addMultiCellWidget(m_audioRecFormat, row, row, 1, 2);
++row;
#endif
m_cfg->setGroup(GeneralOptionsConfigGroup);
tqlayout->addWidget(new TQLabel(i18n("External audio editor"), frame),
layout->addWidget(new TQLabel(i18n("External audio editor"), frame),
row, 0);
TQString defaultAudioEditor = getBestAvailableAudioEditor();
@ -131,18 +131,18 @@ AudioConfigurationPage::AudioConfigurationPage(
m_externalAudioEditorPath = new TQLineEdit(externalAudioEditor, frame);
// m_externalAudioEditorPath->setMinimumWidth(150);
tqlayout->addWidget(m_externalAudioEditorPath, row, 1);
layout->addWidget(m_externalAudioEditorPath, row, 1);
TQPushButton *changePathButton =
new TQPushButton(i18n("Choose..."), frame);
tqlayout->addWidget(changePathButton, row, 2);
layout->addWidget(changePathButton, row, 2);
connect(changePathButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotFileDialog()));
++row;
m_cfg->setGroup(SequencerOptionsConfigGroup);
tqlayout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
layout->addWidget(new TQLabel(i18n("Create JACK outputs"), frame),
row, 0);
// ++row;
@ -150,20 +150,20 @@ AudioConfigurationPage::AudioConfigurationPage(
m_createFaderOuts = new TQCheckBox(i18n("for individual audio instruments"), frame);
m_createFaderOuts->setChecked(m_cfg->readBoolEntry("audiofaderouts", false));
// tqlayout->addWidget(label, row, 0, TQt::AlignRight);
tqlayout->addWidget(m_createFaderOuts, row, 1);
// layout->addWidget(label, row, 0, TQt::AlignRight);
layout->addWidget(m_createFaderOuts, row, 1);
++row;
m_createSubmasterOuts = new TQCheckBox(i18n("for submasters"), frame);
m_createSubmasterOuts->setChecked(m_cfg->readBoolEntry("audiosubmasterouts",
false));
// tqlayout->addWidget(label, row, 0, TQt::AlignRight);
tqlayout->addWidget(m_createSubmasterOuts, row, 1);
// layout->addWidget(label, row, 0, TQt::AlignRight);
layout->addWidget(m_createSubmasterOuts, row, 1);
++row;
#endif
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("General"));
@ -174,17 +174,17 @@ AudioConfigurationPage::AudioConfigurationPage(
#ifdef OFFER_JACK_START_OPTION
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 8, 4, 10, 5);
layout = new TQGridLayout(frame, 8, 4, 10, 5);
row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
label = new TQLabel(i18n("Rosegarden can start the JACK audio daemon (jackd) for you automatically if it isn't already running when Rosegarden starts.\n\nThis is recommended for beginners and those who use Rosegarden as their main audio application, but it might not be to the liking of advanced users.\n\nIf you want to start JACK automatically, make sure the command includes a full path where necessary as well as any command-line arguments you want to use.\n\nFor example: /usr/local/bin/jackd -d alsa -d hw -r44100 -p 2048 -n 2\n\n"), frame);
label->setAlignment(TQt::WordBreak);
tqlayout->addMultiCellWidget(label, row, row, 0, 3);
layout->addMultiCellWidget(label, row, row, 0, 3);
++row;
// JACK control things
@ -193,12 +193,12 @@ AudioConfigurationPage::AudioConfigurationPage(
m_startJack = new TQCheckBox(frame);
m_startJack->setChecked(startJack);
tqlayout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
layout->addWidget(new TQLabel(i18n("Start JACK when Rosegarden starts"), frame), 2, 0);
tqlayout->addWidget(m_startJack, row, 1);
layout->addWidget(m_startJack, row, 1);
++row;
tqlayout->addWidget(new TQLabel(i18n("JACK command"), frame),
layout->addWidget(new TQLabel(i18n("JACK command"), frame),
row, 0);
TQString jackPath = m_cfg->readEntry("jackcommand",
@ -206,10 +206,10 @@ AudioConfigurationPage::AudioConfigurationPage(
"/usr/bin/qjackctl -s");
m_jackPath = new TQLineEdit(jackPath, frame);
tqlayout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
layout->addMultiCellWidget(m_jackPath, row, row, 1, 3);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("JACK Startup"));

18
src/gui/configuration/AudioPropertiesPage.cpp
Unescape View File

@ -59,28 +59,28 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc,
AudioFileManager &afm = doc->getAudioFileManager();
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
tqlayout->addWidget(new TQLabel(i18n("Audio file path:"), frame), 0, 0);
TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
layout->addWidget(new TQLabel(i18n("Audio file path:"), frame), 0, 0);
m_path = new TQLabel(TQString(afm.getAudioPath().c_str()), frame);
tqlayout->addWidget(m_path, 0, 1);
layout->addWidget(m_path, 0, 1);
m_changePathButton =
new TQPushButton(i18n("Choose..."), frame);
tqlayout->addWidget(m_changePathButton, 0, 2);
layout->addWidget(m_changePathButton, 0, 2);
m_diskSpace = new TQLabel(frame);
tqlayout->addWidget(new TQLabel(i18n("Disk space remaining:"), frame), 1, 0);
tqlayout->addWidget(m_diskSpace, 1, 1);
layout->addWidget(new TQLabel(i18n("Disk space remaining:"), frame), 1, 0);
layout->addWidget(m_diskSpace, 1, 1);
m_minutesAtStereo = new TQLabel(frame);
tqlayout->addWidget(
layout->addWidget(
new TQLabel(i18n("Equivalent minutes of 16-bit stereo:"),
frame), 2, 0);
tqlayout->addWidget(m_minutesAtStereo, 2, 1, AlignCenter);
layout->addWidget(m_minutesAtStereo, 2, 1, AlignCenter);
tqlayout->setRowStretch(3, 2);
layout->setRowStretch(3, 2);
calculateStats();

8
src/gui/configuration/ColourConfigurationPage.cpp
Unescape View File

@ -57,7 +57,7 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
: TabbedConfigurationPage(doc, parent, name)
{
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2,
TQGridLayout *layout = new TQGridLayout(frame, 2, 2,
10, 5);
m_map = m_doc->getComposition().getSegmentColourMap();
@ -65,15 +65,15 @@ ColourConfigurationPage::ColourConfigurationPage(RosegardenGUIDoc *doc,
m_colourtable = new ColourTable(frame, m_map, m_listmap);
m_colourtable->setFixedHeight(280);
tqlayout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
layout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
TQPushButton* addColourButton = new TQPushButton(i18n("Add New Color"),
frame);
tqlayout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
layout->addWidget(addColourButton, 1, 0, TQt::AlignHCenter);
TQPushButton* deleteColourButton = new TQPushButton(i18n("Delete Color"),
frame);
tqlayout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
layout->addWidget(deleteColourButton, 1, 1, TQt::AlignHCenter);
connect(addColourButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotAddNew()));

28
src/gui/configuration/DocumentMetaConfigurationPage.cpp
Unescape View File

@ -126,42 +126,42 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
}
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame,
TQGridLayout *layout = new TQGridLayout(frame,
6, 2,
10, 5);
tqlayout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
tqlayout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
layout->addWidget(new TQLabel(i18n("Filename:"), frame), 0, 0);
layout->addWidget(new TQLabel(doc->getTitle(), frame), 0, 1);
tqlayout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Formal duration (to end marker):"), frame), 1, 0);
timeT d = comp.getEndMarker();
RealTime rtd = comp.getElapsedRealTime(d);
tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 1, 1);
tqlayout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
layout->addWidget(new TQLabel(i18n("Playing duration:"), frame), 2, 0);
d = comp.getDuration();
rtd = comp.getElapsedRealTime(d);
tqlayout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
layout->addWidget(new TQLabel(durationToString(comp, 0, d, rtd), frame), 2, 1);
tqlayout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
tqlayout->addWidget(new TQLabel(i18n("%1 used, %2 total")
layout->addWidget(new TQLabel(i18n("Tracks:"), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("%1 used, %2 total")
.arg(usedTracks.size())
.arg(comp.getNbTracks()),
frame), 3, 1);
tqlayout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
tqlayout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
layout->addWidget(new TQLabel(i18n("Segments:"), frame), 4, 0);
layout->addWidget(new TQLabel(i18n("%1 MIDI, %2 audio, %3 total")
.arg(internalSegments)
.arg(audioSegments)
.arg(internalSegments + audioSegments),
frame), 4, 1);
tqlayout->setRowStretch(5, 2);
layout->setRowStretch(5, 2);
addTab(frame, i18n("Statistics"));
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 1, 1, 10, 5);
layout = new TQGridLayout(frame, 1, 1, 10, 5);
TQTable *table = new TQTable(1, 11, frame, "Segment Table");
table->setSelectionMode(TQTable::NoSelection);
@ -312,7 +312,7 @@ DocumentMetaConfigurationPage::DocumentMetaConfigurationPage(RosegardenGUIDoc *d
++i;
}
tqlayout->addWidget(table, 0, 0);
layout->addWidget(table, 0, 0);
addTab(frame, i18n("Segment Summary"));

64
src/gui/configuration/GeneralConfigurationPage.cpp
Unescape View File

@ -69,7 +69,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_cfg->setGroup(GeneralOptionsConfigGroup);
TQFrame *frame;
TQGridLayout *tqlayout;
TQGridLayout *layout;
TQLabel *label = 0;
int row = 0;
@ -77,14 +77,14 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
// "Behavior" tab
//
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame,
layout = new TQGridLayout(frame,
6, 2, // nbrow, nbcol
10, 5);
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
layout->addWidget(new TQLabel(i18n("Double-click opens segment in"),
frame), row, 0);
m_client = new KComboBox(frame);
@ -93,20 +93,20 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_client->insertItem(i18n("Event List editor"));
m_client->setCurrentItem(m_cfg->readUnsignedNumEntry("doubleclickclient", NotationView));
tqlayout->addMultiCellWidget(m_client, row, row, 1, 2);
layout->addMultiCellWidget(m_client, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
layout->addWidget(new TQLabel(i18n("Number of count-in measures when recording"),
frame), row, 0);
m_countIn = new TQSpinBox(frame);
m_countIn->setValue(m_cfg->readUnsignedNumEntry("countinbars", 0));
m_countIn->setMaxValue(10);
m_countIn->setMinValue(0);
tqlayout->addMultiCellWidget(m_countIn, row, row, 1, 2);
layout->addMultiCellWidget(m_countIn, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Auto-save interval"), frame), row, 0);
m_autoSave = new KComboBox(frame);
m_autoSave->insertItem(i18n("Every 30 seconds"));
@ -129,7 +129,7 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_autoSave->setCurrentItem(3);
}
tqlayout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
layout->addMultiCellWidget(m_autoSave, row, row, 1, 2);
++row;
// JACK Transport
@ -138,10 +138,10 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_cfg->setGroup(SequencerOptionsConfigGroup);
label = new TQLabel(i18n("Use JACK transport"), frame);
tqlayout->addWidget(label, row, 0);
layout->addWidget(label, row, 0);
m_jackTransport = new TQCheckBox(frame);
tqlayout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
layout->addMultiCellWidget(m_jackTransport, row, row, 1, 2);
// m_jackTransport->insertItem(i18n("Ignore JACK transport"));
// m_jackTransport->insertItem(i18n("Sync"));
@ -165,10 +165,10 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_cfg->setGroup(GeneralOptionsConfigGroup);
#endif
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
tqlayout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Sequencer status"), frame), row, 0);
TQString status(i18n("Unknown"));
SequenceManager *mgr = doc->getSequenceManager();
@ -190,16 +190,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
}
}
tqlayout->addWidget(new TQLabel(status, frame), row, 1);
layout->addWidget(new TQLabel(status, frame), row, 1);
TQPushButton *showStatusButton = new TQPushButton(i18n("Details..."),
frame);
TQObject::connect(showStatusButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotShowStatus()));
tqlayout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
layout->addWidget(showStatusButton, row, 2, TQt::AlignRight);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("Behavior"));
@ -207,16 +207,16 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
// "Appearance" tab
//
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame,
7, 4, // nbrow, nbcol -- one extra row improves tqlayout
layout = new TQGridLayout(frame,
7, 4, // nbrow, nbcol -- one extra row improves layout
10, 5);
row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addWidget(new TQLabel(i18n("Side-bar parameter box tqlayout"),
layout->addWidget(new TQLabel(i18n("Side-bar parameter box layout"),
frame), row, 0);
m_sidebarStyle = new KComboBox(frame);
@ -227,38 +227,38 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_sidebarStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("sidebarstyle",
0));
tqlayout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
layout->addMultiCellWidget(m_sidebarStyle, row, row, 1, 3);
++row;
tqlayout->addWidget(new TQLabel(i18n("Note name style"),
layout->addWidget(new TQLabel(i18n("Note name style"),
frame), row, 0);
m_nameStyle = new KComboBox(frame);
m_nameStyle->insertItem(i18n("Always use US names (e.g. quarter, 8th)"));
m_nameStyle->insertItem(i18n("Localized (where available)"));
m_nameStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("notenamestyle", Local));
tqlayout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
layout->addMultiCellWidget(m_nameStyle, row, row, 1, 3);
++row;
/*
tqlayout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Show tool context help in status bar"), frame), row, 0);
m_toolContextHelp = new TQCheckBox(frame);
tqlayout->addWidget(m_toolContextHelp, row, 1);
layout->addWidget(m_toolContextHelp, row, 1);
m_toolContextHelp->setChecked(m_cfg->readBoolEntry
("toolcontexthelp", true));
++row;
*/
tqlayout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Show textured background on"), frame), row, 0);
m_backgroundTextures = new TQCheckBox(i18n("Main window"), frame);
tqlayout->addWidget(m_backgroundTextures, row, 1);
layout->addWidget(m_backgroundTextures, row, 1);
m_matrixBackgroundTextures = new TQCheckBox(i18n("Matrix"), frame);
tqlayout->addWidget(m_matrixBackgroundTextures, row, 2);
layout->addWidget(m_matrixBackgroundTextures, row, 2);
m_notationBackgroundTextures = new TQCheckBox(i18n("Notation"), frame);
tqlayout->addWidget(m_notationBackgroundTextures, row, 3);
layout->addWidget(m_notationBackgroundTextures, row, 3);
m_backgroundTextures->setChecked(m_cfg->readBoolEntry
("backgroundtextures", true));
@ -272,17 +272,17 @@ GeneralConfigurationPage::GeneralConfigurationPage(RosegardenGUIDoc *doc,
m_cfg->setGroup(GeneralOptionsConfigGroup);
++row;
tqlayout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Use bundled Klearlook theme"), frame), row, 0);
m_globalStyle = new KComboBox(frame);
m_globalStyle->insertItem(i18n("Never"));
m_globalStyle->insertItem(i18n("When not running under KDE"));
m_globalStyle->insertItem(i18n("Always"));
m_globalStyle->setCurrentItem(m_cfg->readUnsignedNumEntry("Install Own Theme", 1));
tqlayout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
layout->addMultiCellWidget(m_globalStyle, row, row, 1, 3);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("Presentation"));

26
src/gui/configuration/LatencyConfigurationPage.cpp
Unescape View File

@ -56,19 +56,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
#ifdef HAVE_LIBJACK
frame = new TQFrame(m_tabWidget, i18n("JACK latency"));
tqlayout = new TQGridLayout(frame, 6, 5, 10, 10);
layout = new TQGridLayout(frame, 6, 5, 10, 10);
tqlayout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer. It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders. Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
layout->addMultiCellWidget(new TQLabel(i18n("Use the \"Fetch JACK latencies\" button to discover the latency values set at\nthe sequencer. It's recommended that you use the returned values but it's also\npossible to override them manually using the sliders. Note that if you change\nyour JACK server parameters you should always fetch the latency values again.\nThe latency values will be stored by Rosegarden for use next time."), frame),
0, 0,
0, 3);
tqlayout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
tqlayout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("JACK playback latency (in ms)"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("JACK record latency (in ms)"), frame), 3, 0);
m_fetchLatencyValues = new TQPushButton(i18n("Fetch JACK latencies"),
frame);
tqlayout->addWidget(m_fetchLatencyValues, 1, 3);
layout->addWidget(m_fetchLatencyValues, 1, 3);
connect(m_fetchLatencyValues, TQT_SIGNAL(released()),
TQT_SLOT(slotFetchLatencyValues()));
@ -80,19 +80,19 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
m_jackPlayback = new TQSlider(Horizontal, frame);
m_jackPlayback->setTickmarks(TQSlider::Below);
tqlayout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
layout->addMultiCellWidget(m_jackPlayback, 3, 3, 2, 3);
TQLabel *jackPlaybackLabel = new TQLabel(TQString("%1").arg(jackPlaybackValue),
frame);
tqlayout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
layout->addWidget(jackPlaybackLabel, 2, 2, TQt::AlignHCenter);
connect(m_jackPlayback, TQT_SIGNAL(valueChanged(int)),
jackPlaybackLabel, TQT_SLOT(setNum(int)));
m_jackPlayback->setMinValue(0);
tqlayout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
layout->addWidget(new TQLabel("0", frame), 3, 1, TQt::AlignRight);
m_jackPlayback->setMaxValue(500);
tqlayout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
layout->addWidget(new TQLabel("500", frame), 3, 4, TQt::AlignLeft);
m_jackPlayback->setValue(jackPlaybackValue);
@ -103,20 +103,20 @@ LatencyConfigurationPage::LatencyConfigurationPage(RosegardenGUIDoc *doc,
m_jackRecord = new TQSlider(Horizontal, frame);
m_jackRecord->setTickmarks(TQSlider::Below);
tqlayout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
layout->addMultiCellWidget(m_jackRecord, 5, 5, 2, 3);
TQLabel *jackRecordLabel = new TQLabel(TQString("%1").arg(jackRecordValue),
frame);
tqlayout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
layout->addWidget(jackRecordLabel, 4, 2, TQt::AlignHCenter);
connect(m_jackRecord, TQT_SIGNAL(valueChanged(int)),
jackRecordLabel, TQT_SLOT(setNum(int)));
m_jackRecord->setMinValue(0);
tqlayout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
layout->addWidget(new TQLabel("0", frame), 5, 1, TQt::AlignRight);
m_jackRecord->setMaxValue(500);
m_jackRecord->setValue(jackRecordValue);
tqlayout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
layout->addWidget(new TQLabel("500", frame), 5, 4, TQt::AlignLeft);
addTab(frame, i18n("JACK Latency"));
#endif // HAVE_LIBJACK

66
src/gui/configuration/MIDIConfigurationPage.cpp
Unescape View File

@ -78,38 +78,38 @@ MIDIConfigurationPage::MIDIConfigurationPage(
// ---------------- General tab ------------------
//
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame, 9, 4, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 9, 4, 10, 5);
int row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
TQLabel *label = 0;
m_cfg->setGroup(GeneralOptionsConfigGroup);
tqlayout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
layout->addMultiCellWidget(new TQLabel(i18n("Base octave number for MIDI pitch display"),
frame), row, row, 0, 1);
m_midiPitchOctave = new TQSpinBox(frame);
m_midiPitchOctave->setMaxValue(10);
m_midiPitchOctave->setMinValue( -10);
m_midiPitchOctave->setValue(m_cfg->readNumEntry("midipitchoctave", -2));
tqlayout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
layout->addMultiCellWidget(m_midiPitchOctave, row, row, 2, 3);
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
m_cfg->setGroup(GeneralOptionsConfigGroup);
tqlayout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
layout->addMultiCellWidget(new TQLabel(i18n("Always use default studio when loading files"),
frame), row, row, 0, 1);
m_studio = new TQCheckBox(frame);
m_studio->setChecked(m_cfg->readBoolEntry("alwaysusedefaultstudio", false));
tqlayout->addWidget(m_studio, row, 2);
layout->addWidget(m_studio, row, 2);
++row;
// Send Controllers
@ -121,14 +121,14 @@ MIDIConfigurationPage::MIDIConfigurationPage(
TQString controllerTip = i18n("Rosegarden can send all MIDI Controllers (Pan, Reverb etc) to all MIDI devices every\ntime you hit play if you so wish. Please note that this option will usually incur a\ndelay at the start of playback due to the amount of data being transmitted.");
TQToolTip::add
(label, controllerTip);
tqlayout->addMultiCellWidget(label, row, row, 0, 1);
layout->addMultiCellWidget(label, row, row, 0, 1);
m_sendControllersAtPlay = new TQCheckBox(frame);
bool sendControllers = m_cfg->readBoolEntry("alwayssendcontrollers", false);
m_sendControllersAtPlay->setChecked(sendControllers);
TQToolTip::add
(m_sendControllersAtPlay, controllerTip);
tqlayout->addWidget(m_sendControllersAtPlay, row, 2);
layout->addWidget(m_sendControllersAtPlay, row, 2);
++row;
// Timer selection
@ -136,10 +136,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
m_cfg->setGroup(SequencerOptionsConfigGroup);
label = new TQLabel(i18n("Sequencer timing source"), frame);
tqlayout->addMultiCellWidget(label, row, row, 0, 1);
layout->addMultiCellWidget(label, row, row, 0, 1);
m_timer = new KComboBox(frame);
tqlayout->addMultiCellWidget(m_timer, row, row, 2, 3);
layout->addMultiCellWidget(m_timer, row, row, 2, 3);
TQStringList timers = m_doc->getTimers();
m_origTimer = m_doc->getCurrentTimer();
@ -153,7 +153,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
m_cfg->setGroup(SequencerOptionsConfigGroup);
@ -163,25 +163,25 @@ MIDIConfigurationPage::MIDIConfigurationPage(
TQLabel* lbl = new TQLabel(i18n("Load SoundFont to SoundBlaster card at startup"), frame);
TQString tooltip = i18n("Check this box to enable soundfont loading on EMU10K-based cards when Rosegarden is launched");
TQToolTip::add(lbl, tooltip);
tqlayout->addMultiCellWidget(lbl, row, row, 0, 1);
layout->addMultiCellWidget(lbl, row, row, 0, 1);
m_sfxLoadEnabled = new TQCheckBox(frame);
tqlayout->addWidget(m_sfxLoadEnabled, row, 2);
layout->addWidget(m_sfxLoadEnabled, row, 2);
TQToolTip::add(m_sfxLoadEnabled, tooltip);
++row;
tqlayout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Path to 'asfxload' or 'sfxload' command"), frame), row, 0);
m_sfxLoadPath = new TQLineEdit(m_cfg->readEntry("sfxloadpath", "/bin/sfxload"), frame);
tqlayout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
layout->addMultiCellWidget(m_sfxLoadPath, row, row, 1, 2);
m_sfxLoadChoose = new TQPushButton("Choose...", frame);
tqlayout->addWidget(m_sfxLoadChoose, row, 3);
layout->addWidget(m_sfxLoadChoose, row, 3);
++row;
tqlayout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("SoundFont"), frame), row, 0);
m_soundFontPath = new TQLineEdit(m_cfg->readEntry("soundfontpath", ""), frame);
tqlayout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
layout->addMultiCellWidget(m_soundFontPath, row, row, 1, 2);
m_soundFontChoose = new TQPushButton("Choose...", frame);
tqlayout->addWidget(m_soundFontChoose, row, 3);
layout->addWidget(m_soundFontChoose, row, 3);
++row;
bool sfxLoadEnabled = m_cfg->readBoolEntry("sfxloadenabled", false);
@ -202,7 +202,7 @@ MIDIConfigurationPage::MIDIConfigurationPage(
connect(m_soundFontChoose, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotSoundFontChoose()));
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("General"));
@ -211,19 +211,19 @@ MIDIConfigurationPage::MIDIConfigurationPage(
// -------------- Synchronisation tab -----------------
//
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 7, 2, 10, 5);
layout = new TQGridLayout(frame, 7, 2, 10, 5);
row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
// MIDI Clock and System Realtime Messages
//
label = new TQLabel(i18n("MIDI Clock and System messages"), frame);
tqlayout->addWidget(label, row, 0);
layout->addWidget(label, row, 0);
m_midiSync = new KComboBox(frame);
tqlayout->addWidget(m_midiSync, row, 1);
layout->addWidget(m_midiSync, row, 1);
m_midiSync->insertItem(i18n("Off"));
m_midiSync->insertItem(i18n("Send MIDI Clock, Start and Stop"));
@ -239,10 +239,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
// MMC Transport
//
label = new TQLabel(i18n("MIDI Machine Control mode"), frame);
tqlayout->addWidget(label, row, 0);
layout->addWidget(label, row, 0);
m_mmcTransport = new KComboBox(frame);
tqlayout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
layout->addWidget(m_mmcTransport, row, 1); //, TQt::AlignHCenter);
m_mmcTransport->insertItem(i18n("Off"));
m_mmcTransport->insertItem(i18n("MMC Master"));
@ -258,10 +258,10 @@ MIDIConfigurationPage::MIDIConfigurationPage(
// MTC transport
//
label = new TQLabel(i18n("MIDI Time Code mode"), frame);
tqlayout->addWidget(label, row, 0);
layout->addWidget(label, row, 0);
m_mtcTransport = new KComboBox(frame);
tqlayout->addWidget(m_mtcTransport, row, 1);
layout->addWidget(m_mtcTransport, row, 1);
m_mtcTransport->insertItem(i18n("Off"));
m_mtcTransport->insertItem(i18n("MTC Master"));
@ -276,18 +276,18 @@ MIDIConfigurationPage::MIDIConfigurationPage(
TQHBox *hbox = new TQHBox(frame);
hbox->setSpacing(5);
tqlayout->addMultiCellWidget(hbox, row, row, 0, 1);
layout->addMultiCellWidget(hbox, row, row, 0, 1);
label = new TQLabel(i18n("Automatically connect sync output to all devices in use"), hbox);
// tqlayout->addWidget(label, row, 0);
// layout->addWidget(label, row, 0);
m_midiSyncAuto = new TQCheckBox(hbox);
// tqlayout->addWidget(m_midiSyncAuto, row, 1);
// layout->addWidget(m_midiSyncAuto, row, 1);
m_midiSyncAuto->setChecked(m_cfg->readBoolEntry("midisyncautoconnect", false));
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("MIDI Sync"));
}

4
src/gui/configuration/MatrixConfigurationPage.cpp
Unescape View File

@ -50,11 +50,11 @@ MatrixConfigurationPage::MatrixConfigurationPage(KConfig *cfg,
m_cfg->setGroup(MatrixViewConfigGroup);
TQFrame *frame = new TQFrame(m_tabWidget);
TQGridLayout *tqlayout = new TQGridLayout(frame,
TQGridLayout *layout = new TQGridLayout(frame,
4, 2, // nbrow, nbcol
10, 5);
tqlayout->addWidget(new TQLabel("Nothing here yet", frame), 0, 0);
layout->addWidget(new TQLabel("Nothing here yet", frame), 0, 0);
addTab(frame, i18n("General"));
}

148
src/gui/configuration/NotationConfigurationPage.cpp
Unescape View File

@ -74,31 +74,31 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
m_cfg->setGroup(NotationViewConfigGroup);
TQFrame *frame;
TQGridLayout *tqlayout;
TQGridLayout *layout;
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 9, 3, 10, 5);
layout = new TQGridLayout(frame, 9, 3, 10, 5);
int row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addWidget(new TQLabel(i18n("Default tqlayout mode"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Default layout mode"), frame), row, 0);
m_layoutMode = new KComboBox(frame);
m_layoutMode->setEditable(false);
m_layoutMode->insertItem(i18n("Linear tqlayout"));
m_layoutMode->insertItem(i18n("Continuous page tqlayout"));
m_layoutMode->insertItem(i18n("Multiple page tqlayout"));
m_layoutMode->insertItem(i18n("Linear layout"));
m_layoutMode->insertItem(i18n("Continuous page layout"));
m_layoutMode->insertItem(i18n("Multiple page layout"));
int defaultLayoutMode = m_cfg->readNumEntry("layoutmode", 0);
if (defaultLayoutMode >= 0 && defaultLayoutMode <= 2) {
m_layoutMode->setCurrentItem(defaultLayoutMode);
}
tqlayout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
layout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
m_spacing = new KComboBox(frame);
m_spacing->setEditable(false);
@ -118,11 +118,11 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
}
}
tqlayout->addMultiCellWidget(m_spacing, row, row, 1, 2);
layout->addMultiCellWidget(m_spacing, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Default duration factor"), frame), row, 0);
m_proportion = new KComboBox(frame);
m_proportion->setEditable(false);
@ -146,10 +146,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
}
}
tqlayout->addMultiCellWidget(m_proportion, row, row, 1, 2);
layout->addMultiCellWidget(m_proportion, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Show track headers (linear tqlayout only)"),
layout->addWidget(new TQLabel(i18n("Show track headers (linear layout only)"),
frame), row, 0);
m_showTrackHeaders = new KComboBox(frame);
@ -167,76 +167,76 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
"\"When needed\" means \"when staves are too many to all fit"
" in the current window\"")));
tqlayout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
layout->addMultiCellWidget(m_showTrackHeaders, row, row, 1, 2);
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Show non-notation events as question marks"), frame),
row, row, 0, 1);
m_showUnknowns = new TQCheckBox(frame);
bool defaultShowUnknowns = m_cfg->readBoolEntry("showunknowns", false);
m_showUnknowns->setChecked(defaultShowUnknowns);
tqlayout->addWidget(m_showUnknowns, row, 2);
layout->addWidget(m_showUnknowns, row, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Show notation-quantized notes in a different color"), frame),
row, row, 0, 1);
m_colourQuantize = new TQCheckBox(frame);
bool defaultColourQuantize = m_cfg->readBoolEntry("colourquantize", false);
m_colourQuantize->setChecked(defaultColourQuantize);
tqlayout->addWidget(m_colourQuantize, row, 2);
layout->addWidget(m_colourQuantize, row, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Show \"invisible\" events in grey"), frame),
row, row, 0, 1);
m_showInvisibles = new TQCheckBox(frame);
bool defaultShowInvisibles = m_cfg->readBoolEntry("showinvisibles", true);
m_showInvisibles->setChecked(defaultShowInvisibles);
tqlayout->addWidget(m_showInvisibles, row, 2);
layout->addWidget(m_showInvisibles, row, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Show notes outside suggested playable range in red"), frame),
row, row, 0, 1);
m_showRanges = new TQCheckBox(frame);
bool defaultShowRanges = m_cfg->readBoolEntry("showranges", true);
m_showRanges->setChecked(defaultShowRanges);
tqlayout->addWidget(m_showRanges, row, 2);
layout->addWidget(m_showRanges, row, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Highlight superimposed notes with a halo effect"), frame),
row, row, 0, 1);
m_showCollisions = new TQCheckBox(frame);
bool defaultShowCollisions = m_cfg->readBoolEntry("showcollisions", true);
m_showCollisions->setChecked(defaultShowCollisions);
tqlayout->addWidget(m_showCollisions, row, 2);
layout->addWidget(m_showCollisions, row, 2);
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("When recording MIDI, split-and-tie long notes at barlines"), frame),
row, row, 0, 1);
m_splitAndTie = new TQCheckBox(frame);
bool defaultSplitAndTie = m_cfg->readBoolEntry("quantizemakeviable", false);
m_splitAndTie->setChecked(defaultSplitAndTie);
tqlayout->addWidget(m_splitAndTie, row, 2);
layout->addWidget(m_splitAndTie, row, 2);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("Layout"));
@ -244,18 +244,18 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 6, 3, 10, 5);
layout = new TQGridLayout(frame, 6, 3, 10, 5);
row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel(i18n("Default note style for new notes"), frame),
row, row, 0, 1);
tqlayout->setColStretch(2, 10);
layout->setColStretch(2, 10);
m_noteStyle = new KComboBox(frame);
m_noteStyle->setEditable(false);
@ -277,13 +277,13 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
}
}
tqlayout->addWidget(m_noteStyle, row, 2);
layout->addWidget(m_noteStyle, row, 2);
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
tqlayout->addWidget
layout->addWidget
(new TQLabel(i18n("When inserting notes..."), frame), row, 0);
int defaultInsertType = m_cfg->readNumEntry("inserttype", 0);
@ -295,36 +295,36 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
m_insertType->insertItem(i18n("Ignore existing durations"));
m_insertType->setCurrentItem(defaultInsertType);
tqlayout->addMultiCellWidget(m_insertType, row, row, 1, 2);
layout->addMultiCellWidget(m_insertType, row, row, 1, 2);
++row;
bool autoBeam = m_cfg->readBoolEntry("autobeam", true);
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Auto-beam on insert when appropriate"), frame),
row, row, 0, 1);
m_autoBeam = new TQCheckBox(frame);
m_autoBeam->setChecked(autoBeam);
tqlayout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
layout->addMultiCellWidget(m_autoBeam, row, row, 2, 2);
++row;
bool collapse = m_cfg->readBoolEntry("collapse", false);
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel
(i18n("Collapse rests after erase"), frame),
row, row, 0, 1);
m_collapseRests = new TQCheckBox(frame);
m_collapseRests->setChecked(collapse);
tqlayout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
layout->addMultiCellWidget(m_collapseRests, row, row, 2, 2);
++row;
tqlayout->setRowSpacing(row, 20);
layout->setRowSpacing(row, 20);
++row;
tqlayout->addWidget
layout->addWidget
(new TQLabel(i18n("Default paste type"), frame), row, 0);
m_pasteType = new KComboBox(frame);
@ -342,24 +342,24 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
}
m_pasteType->setCurrentItem(defaultPasteType);
tqlayout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
layout->addMultiCellWidget(m_pasteType, row, row, 1, 2);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("Editing"));
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
layout = new TQGridLayout(frame, 4, 2, 10, 5);
row = 0;
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
tqlayout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Accidentals in one octave..."), frame), row, 0);
m_accOctavePolicy = new KComboBox(frame);
m_accOctavePolicy->insertItem(i18n("Affect only that octave"));
m_accOctavePolicy->insertItem(i18n("Require cautionaries in other octaves"));
@ -368,10 +368,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
if (accOctaveMode >= 0 && accOctaveMode < 3) {
m_accOctavePolicy->setCurrentItem(accOctaveMode);
}
tqlayout->addWidget(m_accOctavePolicy, row, 1);
layout->addWidget(m_accOctavePolicy, row, 1);
++row;
tqlayout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Accidentals in one bar..."), frame), row, 0);
m_accBarPolicy = new KComboBox(frame);
m_accBarPolicy->insertItem(i18n("Affect only that bar"));
m_accBarPolicy->insertItem(i18n("Require cautionary resets in following bar"));
@ -380,10 +380,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
if (accBarMode >= 0 && accBarMode < 3) {
m_accBarPolicy->setCurrentItem(accBarMode);
}
tqlayout->addWidget(m_accBarPolicy, row, 1);
layout->addWidget(m_accBarPolicy, row, 1);
++row;
tqlayout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
layout->addWidget(new TQLabel(i18n("Key signature cancellation style"), frame), row, 0);
m_keySigCancelMode = new KComboBox(frame);
m_keySigCancelMode->insertItem(i18n("Cancel only when entering C major or A minor"));
m_keySigCancelMode->insertItem(i18n("Cancel whenever removing sharps or flats"));
@ -392,10 +392,10 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
if (cancelMode >= 0 && cancelMode < 3) {
m_keySigCancelMode->setCurrentItem(cancelMode);
}
tqlayout->addWidget(m_keySigCancelMode, row, 1);
layout->addWidget(m_keySigCancelMode, row, 1);
++row;
tqlayout->setRowStretch(row, 10);
layout->setRowStretch(row, 10);
addTab(frame, i18n("Accidentals"));
@ -431,25 +431,25 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
// TQFrame *mainFrame = new TQFrame(m_tabWidget);
frame = new TQFrame(m_tabWidget);
tqlayout = new TQGridLayout(frame, 2, 4, 10, 5);
layout = new TQGridLayout(frame, 2, 4, 10, 5);
// frame = new TQFrame(noteFontBox);
// tqlayout = new TQGridLayout(frame, 5, 2, 10, 5);
// layout = new TQGridLayout(frame, 5, 2, 10, 5);
m_viewButton = 0;
tqlayout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Notation font"), frame), 0, 0);
m_font = new KComboBox(frame);
#ifdef HAVE_XFT
m_viewButton = new TQPushButton(i18n("View"), frame);
tqlayout->addMultiCellWidget(m_font, row, row, 1, 2);
tqlayout->addWidget(m_viewButton, row, 3);
layout->addMultiCellWidget(m_font, row, row, 1, 2);
layout->addWidget(m_viewButton, row, 3);
TQObject::connect(m_viewButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotViewButtonPressed()));
#else
tqlayout->addMultiCellWidget(m_font, row, row, 1, 3);
layout->addMultiCellWidget(m_font, row, row, 1, 3);
#endif
m_font->setEditable(false);
TQObject::connect(m_font, TQT_SIGNAL(activated(int)),
@ -499,70 +499,70 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
subLayout->setColStretch(1, 10);
tqlayout->addMultiCellWidget(subFrame,
layout->addMultiCellWidget(subFrame,
row, row,
0, 3);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel(i18n("Font size for single-staff views"), frame),
row, row, 0, 1);
m_singleStaffSize = new KComboBox(frame);
m_singleStaffSize->setEditable(false);
tqlayout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
layout->addMultiCellWidget(m_singleStaffSize, row, row, 2, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel(i18n("Font size for multi-staff views"), frame),
row, row, 0, 1);
m_multiStaffSize = new KComboBox(frame);
m_multiStaffSize->setEditable(false);
tqlayout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
layout->addMultiCellWidget(m_multiStaffSize, row, row, 2, 2);
++row;
tqlayout->addMultiCellWidget
layout->addMultiCellWidget
(new TQLabel(i18n("Font size for printing (pt)"), frame),
row, row, 0, 1);
m_printingSize = new KComboBox(frame);
m_printingSize->setEditable(false);
tqlayout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
layout->addMultiCellWidget(m_printingSize, row, row, 2, 2);
++row;
slotPopulateFontCombo(false);
tqlayout->setRowSpacing(row, 15);
layout->setRowSpacing(row, 15);
++row;
TQFont defaultTextFont(NotePixmapFactory::defaultSerifFontFamily),
defaultSansFont(NotePixmapFactory::defaultSansSerifFontFamily),
defaultTimeSigFont(NotePixmapFactory::defaultTimeSigFontFamily);
tqlayout->addWidget
layout->addWidget
(new TQLabel(i18n("Text font"), frame), row, 0);
m_textFont = new KFontRequester(frame);
TQFont textFont = m_cfg->readFontEntry("textfont", &defaultTextFont);
m_textFont->setFont(textFont);
tqlayout->addMultiCellWidget(m_textFont, row, row, 1, 3);
layout->addMultiCellWidget(m_textFont, row, row, 1, 3);
++row;
tqlayout->addWidget
layout->addWidget
(new TQLabel(i18n("Sans-serif font"), frame), row, 0);
m_sansFont = new KFontRequester(frame);
TQFont sansFont = m_cfg->readFontEntry("sansfont", &defaultSansFont);
m_sansFont->setFont(sansFont);
tqlayout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
layout->addMultiCellWidget(m_sansFont, row, row, 1, 3);
++row;
/*!!! No -- not much point in having the time sig font here: it's only
* used if the time sig characters are not found in the notation font,
* and our default notation font has all the characters we need
tqlayout->addWidget
layout->addWidget
(new TQLabel(i18n("Time Signature font"), frame), row, 0);
m_timeSigFont = new KFontRequester(frame);
TQFont timeSigFont = m_cfg->readFontEntry("timesigfont", &defaultTimeSigFont);
m_timeSigFont->setFont(timeSigFont);
tqlayout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
layout->addMultiCellWidget(m_timeSigFont, row, row, 1, 3);
++row;
*/

6
src/gui/dialogs/BeatsBarsDialog.cpp
Unescape View File

@ -50,16 +50,16 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
i18n("The selected audio segment contains:"), hbox);
TQFrame *frame = new TQFrame(gbox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 1, 2, 5, 5);
m_spinBox = new TQSpinBox(1, INT_MAX, 1, frame, "glee");
tqlayout->addWidget(m_spinBox, 0, 0);
layout->addWidget(m_spinBox, 0, 0);
m_comboBox = new KComboBox(false, frame);
m_comboBox->insertItem(i18n("beat(s)"));
m_comboBox->insertItem(i18n("bar(s)"));
m_comboBox->setCurrentItem(0);
tqlayout->addWidget(m_comboBox, 0, 1);
layout->addWidget(m_comboBox, 0, 1);
}
}

8
src/gui/dialogs/CountdownDialog.cpp
Unescape View File

@ -48,14 +48,14 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
m_progressBarWidth(150),
m_progressBarHeight(15)
{
TQBoxLayout *tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
TQBoxLayout *layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
setCaption(i18n("Recording..."));
TQHBox *hBox = new TQHBox(this);
m_label = new TQLabel(hBox);
m_time = new TQLabel(hBox);
tqlayout->addWidget(hBox, 0, AlignCenter);
layout->addWidget(hBox, 0, AlignCenter);
m_label->setText(i18n("Recording time remaining: "));
m_progressBar =
@ -68,8 +68,8 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
m_stopButton = new TQPushButton(i18n("Stop"), this);
m_stopButton->setFixedWidth(60);
tqlayout->addWidget(m_progressBar, 0, AlignCenter);
tqlayout->addWidget(m_stopButton, 0, AlignRight);
layout->addWidget(m_progressBar, 0, AlignCenter);
layout->addWidget(m_stopButton, 0, AlignRight);
connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped()));

2
src/gui/dialogs/EventFilterDialog.h
Unescape View File

@ -143,7 +143,7 @@ protected slots:
private:
//---------[ data members ]-----------------------------
TQGridLayout* tqlayout;
TQGridLayout* layout;
TQComboBox* m_noteDurationFromComboBox;
TQComboBox* m_noteDurationIncludeComboBox;

28
src/gui/dialogs/ManageMetronomeDialog.cpp
Unescape View File

@ -77,11 +77,11 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
(1, Qt::Horizontal, i18n("Metronome Instrument"), vbox);
TQFrame *frame = new TQFrame(deviceBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
m_metronomeDevice = new KComboBox(frame);
tqlayout->addWidget(m_metronomeDevice, 0, 1);
layout->addWidget(m_metronomeDevice, 0, 1);
DeviceList *devices = doc->getStudio().getDevices();
DeviceListConstIterator it;
@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
}
}
tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
m_metronomeInstrument = new KComboBox(frame);
connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
tqlayout->addWidget(m_metronomeInstrument, 1, 1);
layout->addWidget(m_metronomeInstrument, 1, 1);
TQGroupBox *beatBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Beats"), vbox);
frame = new TQFrame(beatBox);
tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
layout = new TQGridLayout(frame, 4, 2, 10, 5);
tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
m_metronomeResolution = new KComboBox(frame);
m_metronomeResolution->insertItem(i18n("None"));
m_metronomeResolution->insertItem(i18n("Bars only"));
m_metronomeResolution->insertItem(i18n("Bars and beats"));
m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
tqlayout->addWidget(m_metronomeResolution, 0, 1);
layout->addWidget(m_metronomeResolution, 0, 1);
tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
m_metronomeBarVely = new TQSpinBox(frame);
m_metronomeBarVely->setMinValue(0);
m_metronomeBarVely->setMaxValue(127);
connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
tqlayout->addWidget(m_metronomeBarVely, 1, 1);
layout->addWidget(m_metronomeBarVely, 1, 1);
tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
m_metronomeBeatVely = new TQSpinBox(frame);
m_metronomeBeatVely->setMinValue(0);
m_metronomeBeatVely->setMaxValue(127);
connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
tqlayout->addWidget(m_metronomeBeatVely, 2, 1);
layout->addWidget(m_metronomeBeatVely, 2, 1);
tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
m_metronomeSubBeatVely = new TQSpinBox(frame);
m_metronomeSubBeatVely->setMinValue(0);
m_metronomeSubBeatVely->setMaxValue(127);
connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1);
layout->addWidget(m_metronomeSubBeatVely, 3, 1);
vbox = new TQVBox(hbox);

14
src/gui/dialogs/MarkerModifyDialog.cpp
Unescape View File

@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition,
/*!!!
tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
m_timeEdit = new TQSpinBox(frame);
tqlayout->addWidget(m_timeEdit, 0, 1);
layout->addWidget(m_timeEdit, 0, 1);
m_timeEdit->setMinValue(INT_MIN);
m_timeEdit->setMaxValue(INT_MAX);
@ -95,15 +95,15 @@ MarkerModifyDialog::initialise(Composition *composition,
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5);
tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
m_nameEdit = new TQLineEdit(name, frame);
tqlayout->addWidget(m_nameEdit, 0, 1);
layout->addWidget(m_nameEdit, 0, 1);
tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
m_desEdit = new TQLineEdit(des, frame);
tqlayout->addWidget(m_desEdit, 1, 1);
layout->addWidget(m_desEdit, 1, 1);
m_nameEdit->selectAll();
m_nameEdit->setFocus();

4
src/gui/dialogs/PitchPickerDialog.cpp
Unescape View File

@ -43,10 +43,10 @@ PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQStrin
TQFrame *frame = new TQFrame(vBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
m_pitch = new PitchChooser(text, frame, initialPitch);
tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
}
PitchPickerDialog::~PitchPickerDialog()

58
src/gui/dialogs/SimpleEventEditDialog.cpp
Unescape View File

@ -76,16 +76,16 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
tqlayout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
if (inserting) {
m_typeLabel = 0;
m_typeCombo = new KComboBox(frame);
tqlayout->addWidget(m_typeCombo, 0, 1);
layout->addWidget(m_typeCombo, 0, 1);
m_typeCombo->insertItem(strtoqstr(Note::EventType));
m_typeCombo->insertItem(strtoqstr(Controller::EventType));
@ -111,15 +111,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_typeCombo = 0;
m_typeLabel = new TQLabel(frame);
tqlayout->addWidget(m_typeLabel, 0, 1);
layout->addWidget(m_typeLabel, 0, 1);
}
m_timeLabel = new TQLabel(i18n("Absolute time:"), frame);
tqlayout->addWidget(m_timeLabel, 1, 0);
layout->addWidget(m_timeLabel, 1, 0);
m_timeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_timeEditButton = new TQPushButton("edit", frame);
tqlayout->addWidget(m_timeSpinBox, 1, 1);
tqlayout->addWidget(m_timeEditButton, 1, 2);
layout->addWidget(m_timeSpinBox, 1, 1);
layout->addWidget(m_timeEditButton, 1, 2);
connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotAbsoluteTimeChanged(int)));
@ -127,11 +127,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditAbsoluteTime()));
m_durationLabel = new TQLabel(i18n("Duration:"), frame);
tqlayout->addWidget(m_durationLabel, 2, 0);
layout->addWidget(m_durationLabel, 2, 0);
m_durationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_durationEditButton = new TQPushButton("edit", frame);
tqlayout->addWidget(m_durationSpinBox, 2, 1);
tqlayout->addWidget(m_durationEditButton, 2, 2);
layout->addWidget(m_durationSpinBox, 2, 1);
layout->addWidget(m_durationEditButton, 2, 2);
connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotDurationChanged(int)));
@ -139,11 +139,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditDuration()));
m_pitchLabel = new TQLabel(i18n("Pitch:"), frame);
tqlayout->addWidget(m_pitchLabel, 3, 0);
layout->addWidget(m_pitchLabel, 3, 0);
m_pitchSpinBox = new TQSpinBox(frame);
m_pitchEditButton = new TQPushButton("edit", frame);
tqlayout->addWidget(m_pitchSpinBox, 3, 1);
tqlayout->addWidget(m_pitchEditButton, 3, 2);
layout->addWidget(m_pitchSpinBox, 3, 1);
layout->addWidget(m_pitchEditButton, 3, 2);
connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotPitchChanged(int)));
@ -157,13 +157,13 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_controllerLabelValue = new TQLabel(i18n("<none>"), frame);
m_controllerLabelValue->setAlignment(TQLabel::AlignRight);
tqlayout->addWidget(m_controllerLabel, 4, 0);
tqlayout->addWidget(m_controllerLabelValue, 4, 1);
layout->addWidget(m_controllerLabel, 4, 0);
layout->addWidget(m_controllerLabelValue, 4, 1);
m_velocityLabel = new TQLabel(i18n("Velocity:"), frame);
tqlayout->addWidget(m_velocityLabel, 5, 0);
layout->addWidget(m_velocityLabel, 5, 0);
m_velocitySpinBox = new TQSpinBox(frame);
tqlayout->addWidget(m_velocitySpinBox, 5, 1);
layout->addWidget(m_velocitySpinBox, 5, 1);
connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotVelocityChanged(int)));
@ -172,14 +172,14 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_velocitySpinBox->setMaxValue(MidiMaxValue);
m_metaLabel = new TQLabel(i18n("Meta string:"), frame);
tqlayout->addWidget(m_metaLabel, 6, 0);
layout->addWidget(m_metaLabel, 6, 0);
m_metaEdit = new TQLineEdit(frame);
tqlayout->addWidget(m_metaEdit, 6, 1);
layout->addWidget(m_metaEdit, 6, 1);
m_sysexLoadButton = new TQPushButton(i18n("Load data"), frame);
tqlayout->addWidget(m_sysexLoadButton, 6, 2);
layout->addWidget(m_sysexLoadButton, 6, 2);
m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame);
tqlayout->addWidget(m_sysexSaveButton, 4, 2);
layout->addWidget(m_sysexSaveButton, 4, 2);
connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)),
TQT_SLOT(slotMetaChanged(const TQString &)));
@ -193,21 +193,21 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
frame = new TQFrame(m_notationGroupBox);
tqlayout = new TQGridLayout(frame, 3, 3, 5, 5);
layout = new TQGridLayout(frame, 3, 3, 5, 5);
m_lockNotationValues = new TQCheckBox(i18n("Lock to changes in performed values"), frame);
tqlayout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
m_lockNotationValues->setChecked(true);
connect(m_lockNotationValues, TQT_SIGNAL(released()),
TQT_SLOT(slotLockNotationChanged()));
m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame);
tqlayout->addWidget(m_notationTimeLabel, 1, 0);
layout->addWidget(m_notationTimeLabel, 1, 0);
m_notationTimeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_notationTimeEditButton = new TQPushButton("edit", frame);
tqlayout->addWidget(m_notationTimeSpinBox, 1, 1);
tqlayout->addWidget(m_notationTimeEditButton, 1, 2);
layout->addWidget(m_notationTimeSpinBox, 1, 1);
layout->addWidget(m_notationTimeEditButton, 1, 2);
connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotNotationAbsoluteTimeChanged(int)));
@ -215,11 +215,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditNotationAbsoluteTime()));
m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame);
tqlayout->addWidget(m_notationDurationLabel, 2, 0);
layout->addWidget(m_notationDurationLabel, 2, 0);
m_notationDurationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_notationDurationEditButton = new TQPushButton("edit", frame);
tqlayout->addWidget(m_notationDurationSpinBox, 2, 1);
tqlayout->addWidget(m_notationDurationEditButton, 2, 2);
layout->addWidget(m_notationDurationSpinBox, 2, 1);
layout->addWidget(m_notationDurationEditButton, 2, 2);
connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotNotationDurationChanged(int)));

12
src/gui/dialogs/SplitByPitchDialog.cpp
Unescape View File

@ -49,27 +49,27 @@ SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
TQFrame *frame = new TQFrame(vBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
m_pitch = new PitchChooser(i18n("Starting split pitch"), frame, 60);
tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
m_range = new TQCheckBox(i18n("Range up and down to follow music"), frame);
tqlayout->addMultiCellWidget(m_range,
layout->addMultiCellWidget(m_range,
1, 1, // fromRow, toRow
0, 2 // fromCol, toCol
);
m_duplicate = new TQCheckBox(i18n("Duplicate non-note events"), frame);
tqlayout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
layout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
tqlayout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
m_clefs = new KComboBox(frame);
m_clefs->insertItem(i18n("Leave clefs alone"));
m_clefs->insertItem(i18n("Guess new clefs"));
m_clefs->insertItem(i18n("Use treble and bass clefs"));
tqlayout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
layout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
m_range->setChecked(true);
m_duplicate->setChecked(true);

12
src/gui/dialogs/SplitByRecordingSrcDialog.cpp
Unescape View File

@ -52,23 +52,23 @@ SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, Rosegarde
TQGroupBox *groupBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Recording Source"), vBox);
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
tqlayout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
layout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
m_channel = new KComboBox( frame );
m_channel->setSizeLimit( 17 );
tqlayout->addWidget(m_channel, 0, 1);
layout->addWidget(m_channel, 0, 1);
TQSpacerItem *spacer = new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
tqlayout->addItem( spacer, 0, 2 );
layout->addItem( spacer, 0, 2 );
m_channel->insertItem(i18n("any"));
for (int i = 1; i < 17; ++i) {
m_channel->insertItem(TQString::number(i));
}
tqlayout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
layout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
m_device = new KComboBox( frame );
tqlayout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
layout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
m_deviceIds.clear();
m_deviceIds.push_back( -1);

26
src/gui/dialogs/TempoDialog.cpp
Unescape View File

@ -63,18 +63,18 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox);
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5);
// Set tempo
tqlayout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
layout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
tqlayout->addWidget(m_tempoValueSpinBox, 0, 2);
layout->addWidget(m_tempoValueSpinBox, 0, 2);
connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
TQT_SLOT(slotTempoChanged(const TQString &)));
m_tempoTap= new TQPushButton(i18n("Tap"), frame);
tqlayout->addWidget(m_tempoTap, 0, 3);
layout->addWidget(m_tempoTap, 0, 3);
connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked()));
@ -85,13 +85,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
// m_tempoTargetCheckBox = new TQCheckBox(i18n("Ramping to:"), frame);
m_tempoTargetSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
// tqlayout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
// tqlayout->addWidget(m_tempoTargetSpinBox, 1, 2);
// layout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
// layout->addWidget(m_tempoTargetSpinBox, 1, 2);
tqlayout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
tqlayout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
tqlayout->addWidget(m_tempoRampToTarget, 3, 1);
tqlayout->addWidget(m_tempoTargetSpinBox, 3, 2);
layout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
layout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
layout->addWidget(m_tempoRampToTarget, 3, 1);
layout->addWidget(m_tempoTargetSpinBox, 3, 2);
// connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()),
// TQT_SLOT(slotTargetCheckBoxClicked()));
@ -105,13 +105,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
TQT_SLOT(slotTargetChanged(const TQString &)));
m_tempoBeatLabel = new TQLabel(frame);
tqlayout->addWidget(m_tempoBeatLabel, 0, 4);
layout->addWidget(m_tempoBeatLabel, 0, 4);
m_tempoBeat = new TQLabel(frame);
tqlayout->addWidget(m_tempoBeat, 0, 5);
layout->addWidget(m_tempoBeat, 0, 5);
m_tempoBeatsPerMinute = new TQLabel(frame);
tqlayout->addWidget(m_tempoBeatsPerMinute, 0, 6);
layout->addWidget(m_tempoBeatsPerMinute, 0, 6);
m_timeEditor = 0;

12
src/gui/dialogs/TriggerSegmentDialog.cpp
Unescape View File

@ -56,13 +56,13 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
TQVBox *vbox = makeVBoxMainWidget();
TQFrame *frame = new TQFrame(vbox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5);
TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame);
tqlayout->addWidget(label, 0, 0);
layout->addWidget(label, 0, 0);
m_segment = new KComboBox(frame);
tqlayout->addWidget(m_segment, 0, 1);
layout->addWidget(m_segment, 0, 1);
int n = 1;
for (Composition::triggersegmentcontaineriterator i =
@ -73,10 +73,10 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
}
label = new TQLabel(i18n("Perform with timing: "), frame);
tqlayout->addWidget(label, 1, 0);
layout->addWidget(label, 1, 0);
m_adjustTime = new KComboBox(frame);
tqlayout->addWidget(m_adjustTime, 1, 1);
layout->addWidget(m_adjustTime, 1, 1);
m_adjustTime->insertItem(i18n("As stored"));
m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
m_retune->setChecked(true);
tqlayout->addWidget(m_retune, 2, 1);
layout->addWidget(m_retune, 2, 1);
setupFromConfig();
}

22
src/gui/dialogs/UseOrnamentDialog.cpp
Unescape View File

@ -63,13 +63,13 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox);
TQFrame *frame = new TQFrame(notationBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5);
label = new TQLabel(i18n("Display as: "), frame);
tqlayout->addWidget(label, 0, 0);
layout->addWidget(label, 0, 0);
m_mark = new KComboBox(frame);
tqlayout->addWidget(m_mark, 0, 1);
layout->addWidget(m_mark, 0, 1);
m_marks.push_back(Marks::Trill);
m_marks.push_back(Marks::LongTrill);
@ -96,21 +96,21 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
m_textLabel = new TQLabel(i18n(" Text: "), frame);
tqlayout->addWidget(m_textLabel, 0, 2);
layout->addWidget(m_textLabel, 0, 2);
m_text = new TQLineEdit(frame);
tqlayout->addWidget(m_text, 0, 3);
layout->addWidget(m_text, 0, 3);
TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox);
frame = new TQFrame(performBox);
tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
layout = new TQGridLayout(frame, 3, 2, 5, 5);
label = new TQLabel(i18n("Perform using triggered segment: "), frame);
tqlayout->addWidget(label, 0, 0);
layout->addWidget(label, 0, 0);
m_ornament = new KComboBox(frame);
tqlayout->addWidget(m_ornament, 0, 1);
layout->addWidget(m_ornament, 0, 1);
int n = 1;
for (Composition::triggersegmentcontaineriterator i =
@ -121,10 +121,10 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
}
label = new TQLabel(i18n("Perform with timing: "), frame);
tqlayout->addWidget(label, 1, 0);
layout->addWidget(label, 1, 0);
m_adjustTime = new KComboBox(frame);
tqlayout->addWidget(m_adjustTime, 1, 1);
layout->addWidget(m_adjustTime, 1, 1);
m_adjustTime->insertItem(i18n("As stored"));
m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
m_retune->setChecked(true);
tqlayout->addWidget(m_retune, 2, 1);
layout->addWidget(m_retune, 2, 1);
setupFromConfig();
}

26
src/gui/editors/eventlist/EventView.cpp
Unescape View File

@ -161,40 +161,40 @@ EventView::EventView(RosegardenGUIDoc *doc,
(1, Qt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget());
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 5, 3, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 5, 3, 5, 5);
tqlayout->addWidget(new TQLabel(i18n("Label: "), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Label: "), frame), 0, 0);
TQString label = strtoqstr(segments[0]->getLabel());
if (label == "")
label = i18n("<no label>");
m_triggerName = new TQLabel(label, frame);
tqlayout->addWidget(m_triggerName, 0, 1);
layout->addWidget(m_triggerName, 0, 1);
TQPushButton *editButton = new TQPushButton(i18n("edit"), frame);
tqlayout->addWidget(editButton, 0, 2);
layout->addWidget(editButton, 0, 2);
connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName()));
tqlayout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0);
m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame);
tqlayout->addWidget(m_triggerPitch, 1, 1);
layout->addWidget(m_triggerPitch, 1, 1);
editButton = new TQPushButton(i18n("edit"), frame);
tqlayout->addWidget(editButton, 1, 2);
layout->addWidget(editButton, 1, 2);
connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch()));
tqlayout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0);
layout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0);
m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame);
tqlayout->addWidget(m_triggerVelocity, 2, 1);
layout->addWidget(m_triggerVelocity, 2, 1);
editButton = new TQPushButton(i18n("edit"), frame);
tqlayout->addWidget(editButton, 2, 2);
layout->addWidget(editButton, 2, 2);
connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity()));
/*!!! Comment out these two options, which are not yet used
anywhere else -- intended for use with library ornaments, not
yet implemented
tqlayout->addWidget(new TQLabel(i18n("Default timing: "), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("Default timing: "), frame), 3, 0);
KComboBox *adjust = new KComboBox(frame);
tqlayout->addMultiCellWidget(adjust, 3, 3, 1, 2);
layout->addMultiCellWidget(adjust, 3, 3, 1, 2);
adjust->insertItem(i18n("As stored"));
adjust->insertItem(i18n("Truncate if longer than note"));
adjust->insertItem(i18n("End at same time as note"));
@ -216,7 +216,7 @@ EventView::EventView(RosegardenGUIDoc *doc,
TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame);
retune->setChecked(rec->getDefaultRetune());
connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged()));
tqlayout->addMultiCellWidget(retune, 4, 4, 1, 2);
layout->addMultiCellWidget(retune, 4, 4, 1, 2);
*/

4
src/gui/editors/matrix/MatrixHLayout.cpp
Unescape View File

@ -61,7 +61,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
{
Profiler profiler("MatrixHLayout::scanStaff", true);
// The Matrix tqlayout is not currently designed to be able to lay
// The Matrix layout is not currently designed to be able to lay
// out more than one staff, because we have no requirement to show
// more than one at once in the Matrix view. To make it work for
// multiple staffs should be straightforward; we just need to bear
@ -88,7 +88,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase,
}
// Do this in two parts: bar lines separately from elements.
// (We don't need to do all that stuff notationhtqlayout has to do,
// (We don't need to do all that stuff notationhlayout has to do,
// scanning the notes bar-by-bar; we can just place the bar lines
// in the theoretically-correct places and do the same with the
// notes quite independently.)

16
src/gui/editors/matrix/MatrixHLayout.h
Unescape View File

@ -62,7 +62,7 @@ public:
timeT = 0);
/**
* Returns the total length of all elements once tqlayout is done.
* Returns the total length of all elements once layout is done.
* This is the x-coord of the end of the last element on the
* longest staff
*/
@ -84,9 +84,9 @@ public:
virtual double getBarPosition(int barNo) const;
/**
* Precomputes tqlayout data for a single staff, updating any
* Precomputes layout data for a single staff, updating any
* internal data stores associated with that staff and updating
* any tqlayout-related properties in the events on the staff's
* any layout-related properties in the events on the staff's
* segment.
*/
virtual void scanStaff(Staff&,
@ -94,10 +94,10 @@ public:
timeT = 0);
/**
* Computes any tqlayout data that may depend on the results of
* Computes any layout data that may depend on the results of
* scanning more than one staff. This may mean doing most of
* the tqlayout (likely for horizontal tqlayout) or nothing at all
* (likely for vertical tqlayout).
* the layout (likely for horizontal layout) or nothing at all
* (likely for vertical layout).
*/
virtual void finishLayout(timeT = 0,
timeT = 0);
@ -118,7 +118,7 @@ protected:
// pair of has-time-sig and time-sig
typedef std::pair<bool, TimeSignature> TimeSigData;
// pair of tqlayout-x and time-signature if there is one
// pair of layout-x and time-signature if there is one
typedef std::pair<double, TimeSigData> BarData;
typedef FastVector<BarData> BarDataList;
BarDataList m_barData;
@ -133,7 +133,7 @@ protected:
*/
class ZoomableMatrixHLayoutRulerScale : public RulerScale, public HZoomable {
public:
ZoomableMatrixHLayoutRulerScale(MatrixHLayout& tqlayout) : RulerScale(tqlayout.getComposition()), m_referenceHLayout(tqlayout) {};
ZoomableMatrixHLayoutRulerScale(MatrixHLayout& layout) : RulerScale(layout.getComposition()), m_referenceHLayout(layout) {};
virtual double getBarPosition(int n) const { return m_referenceHLayout.getBarPosition(n) * getHScaleFactor(); }
virtual double getXForTime(timeT time) const { return m_referenceHLayout.getXForTime(time) * getHScaleFactor(); }

10
src/gui/editors/matrix/MatrixVLayout.h
Unescape View File

@ -58,9 +58,9 @@ public:
timeT = 0);
/**
* Precomputes tqlayout data for a single staff, updating any
* Precomputes layout data for a single staff, updating any
* internal data stores associated with that staff and updating
* any tqlayout-related properties in the events on the staff's
* any layout-related properties in the events on the staff's
* segment.
*/
virtual void scanStaff(Staff &staff,
@ -68,10 +68,10 @@ public:
timeT = 0);
/**
* Computes any tqlayout data that may depend on the results of
* Computes any layout data that may depend on the results of
* scanning more than one staff. This may mean doing most of
* the tqlayout (likely for horizontal tqlayout) or nothing at all
* (likely for vertical tqlayout).
* the layout (likely for horizontal layout) or nothing at all
* (likely for vertical layout).
*/
virtual void finishLayout(timeT = 0,
timeT = 0);

64
src/gui/editors/matrix/MatrixView.cpp
Unescape View File

@ -140,10 +140,10 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQWidget *parent,
bool drumMode)
: EditView(doc, segments, 3, parent, "matrixview"),
m_htqlayout(&doc->getComposition()),
m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)),
m_vtqlayout(),
m_snapGrid(new SnapGrid(&m_htqlayout)),
m_hlayout(&doc->getComposition()),
m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_hlayout)),
m_vlayout(),
m_snapGrid(new SnapGrid(&m_hlayout)),
m_lastEndMarkerTime(0),
m_hoveredOverAbsoluteTime(0),
m_hoveredOverNoteName(0),
@ -430,11 +430,11 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
(doc, TQT_SIGNAL(pointerPositionChanged(timeT)),
TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT)));
MATRIX_DEBUG << "MatrixView : applying tqlayout\n";
MATRIX_DEBUG << "MatrixView : applying layout\n";
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
else {
MATRIX_DEBUG << "MatrixView : rendering elements\n";
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@ -446,13 +446,13 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
}
StandardRuler *topStandardRuler = new StandardRuler(getDocument(),
&m_htqlayout, int(xorigin), 25,
&m_hlayout, int(xorigin), 25,
false, getCentralWidget());
topStandardRuler->setSnapGrid(m_snapGrid);
setTopStandardRuler(topStandardRuler);
StandardRuler *bottomStandardRuler = new StandardRuler(getDocument(),
&m_htqlayout, 0, 25,
&m_hlayout, 0, 25,
true, getBottomWidget());
bottomStandardRuler->setSnapGrid(m_snapGrid);
setBottomStandardRuler(bottomStandardRuler);
@ -1032,20 +1032,20 @@ bool MatrixView::applyLayout(int staffNo,
{
Profiler profiler("MatrixView::applyLayout", true);
m_htqlayout.reset();
m_vtqlayout.reset();
m_hlayout.reset();
m_vlayout.reset();
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
if (staffNo >= 0 && (int)i != staffNo)
continue;
m_htqlayout.scanStaff(*m_staffs[i], startTime, endTime);
m_vtqlayout.scanStaff(*m_staffs[i], startTime, endTime);
m_hlayout.scanStaff(*m_staffs[i], startTime, endTime);
m_vlayout.scanStaff(*m_staffs[i], startTime, endTime);
}
m_htqlayout.finishLayout();
m_vtqlayout.finishLayout();
m_hlayout.finishLayout();
m_vlayout.finishLayout();
if (m_staffs[0]->getSegment().getEndMarkerTime() != m_lastEndMarkerTime ||
m_lastEndMarkerTime == 0 ||
@ -1552,7 +1552,7 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
Composition &comp = getDocument()->getComposition();
int barNo = comp.getBarNumber(time);
if (barNo >= m_htqlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
if (barNo >= m_hlayout.getLastVisibleBarOnStaff(*m_staffs[0])) {
Segment &seg = m_staffs[0]->getSegment();
@ -1561,20 +1561,20 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll)
seg.getStartTime() +
((time - seg.getStartTime()) %
(seg.getEndMarkerTime() - seg.getStartTime()));
m_staffs[0]->setPointerPosition(m_htqlayout, time);
m_staffs[0]->setPointerPosition(m_hlayout, time);
} else {
m_staffs[0]->hidePointer();
scroll = false;
}
} else if (barNo < m_htqlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
} else if (barNo < m_hlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) {
m_staffs[0]->hidePointer();
scroll = false;
} else {
m_staffs[0]->setPointerPosition(m_htqlayout, time);
m_staffs[0]->setPointerPosition(m_hlayout, time);
}
if (scroll && !getCanvasView()->isAutoScrolling())
getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
updateView();
}
@ -1585,11 +1585,11 @@ MatrixView::slotSetInsertCursorPosition(timeT time, bool scroll)
//!!! For now. Probably unlike slotSetPointerPosition this one
// should snap to the nearest event or grid line.
m_staffs[0]->setInsertCursorPosition(m_htqlayout, time);
m_staffs[0]->setInsertCursorPosition(m_hlayout, time);
if (scroll && !getCanvasView()->isAutoScrolling()) {
getCanvasView()->slotScrollHoriz
(static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time))));
(static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time))));
}
updateView();
@ -2052,7 +2052,7 @@ MatrixView::slotSetSnap(timeT t)
}
for (unsigned int i = 0; i < m_staffs.size(); ++i)
m_staffs[i]->sizeStaff(m_htqlayout);
m_staffs[i]->sizeStaff(m_hlayout);
m_segments[0]->setSnapGridSize(t);
@ -2314,7 +2314,7 @@ MatrixView::slotZoomOut()
void
MatrixView::scrollToTime(timeT t)
{
double layoutCoord = m_htqlayout.getXForTime(t);
double layoutCoord = m_hlayout.getXForTime(t);
getCanvasView()->slotScrollHoriz(int(layoutCoord));
}
@ -2366,7 +2366,7 @@ MatrixView::addPropertyViewRuler(const PropertyName &property)
int height = 20;
PropertyViewRuler *newRuler = new PropertyViewRuler(&m_htqlayout,
PropertyViewRuler *newRuler = new PropertyViewRuler(&m_hlayout,
m_segments[0],
property,
xorigin,
@ -2409,7 +2409,7 @@ MatrixView::removePropertyViewRuler(unsigned int number)
RulerScale*
MatrixView::getHLayout()
{
return &m_htqlayout;
return &m_hlayout;
}
Staff*
@ -2429,14 +2429,14 @@ timeT
MatrixView::getInsertionTime()
{
MatrixStaff *staff = m_staffs[0];
return staff->getInsertCursorTime(m_htqlayout);
return staff->getInsertCursorTime(m_hlayout);
}
void
MatrixView::slotStepBackward()
{
timeT time(getInsertionTime());
slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
(time - 1,
SnapGrid::SnapLeft));
}
@ -2445,7 +2445,7 @@ void
MatrixView::slotStepForward()
{
timeT time(getInsertionTime());
slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime
slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime
(time + 1,
SnapGrid::SnapRight));
}
@ -2553,7 +2553,7 @@ MatrixView::readjustCanvasSize()
MatrixStaff &staff = *m_staffs[i];
staff.sizeStaff(m_htqlayout);
staff.sizeStaff(m_hlayout);
// if (staff.getTotalWidth() + staff.getX() > maxWidth) {
// maxWidth = staff.getTotalWidth() + staff.getX() + 1;
@ -2745,10 +2745,10 @@ int MatrixView::computePostLayoutWidth()
{
Segment *segment = m_segments[0];
Composition *composition = segment->getComposition();
int endX = int(m_htqlayout.getXForTime
int endX = int(m_hlayout.getXForTime
(composition->getBarEndForTime
(segment->getEndMarkerTime())));
int startX = int(m_htqlayout.getXForTime
int startX = int(m_hlayout.getXForTime
(composition->getBarStartForTime
(segment->getStartTime())));
@ -3050,7 +3050,7 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
readjustCanvasSize();
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout"));
else {
MATRIX_DEBUG << "MatrixView : rendering elements\n";
m_staffs[0]->positionAllElements();

4
src/gui/editors/matrix/MatrixView.h
Unescape View File

@ -594,8 +594,8 @@ protected:
std::vector<MatrixStaff*> m_staffs;
MatrixHLayout m_htqlayout;
MatrixVLayout m_vtqlayout;
MatrixHLayout m_hlayout;
MatrixVLayout m_vlayout;
SnapGrid *m_snapGrid;
timeT m_lastEndMarkerTime;

4
src/gui/editors/notation/NotationElement.h
Unescape View File

@ -43,7 +43,7 @@ class Event;
/**
* The Notation H and V tqlayout is performed on a
* The Notation H and V layout is performed on a
* NotationElementList. Once this is done, each NotationElement is
* affected a TQCanvasItem which is set at these coords.
*
@ -82,7 +82,7 @@ public:
* Sets the X coordinate and width of the space "underneath"
* this element, i.e. the extents within which a mouse click
* or some such might be considered to be interested in this
* element as opposed to any other. These are tqlayout coords
* element as opposed to any other. These are layout coords
*/
void setLayoutAirspace(double x, double width) {
m_airX = x; m_airWidth = width;

6
src/gui/editors/notation/NotationGroup.h
Unescape View File

@ -73,13 +73,13 @@ public:
/**
* Writes the BEAMED, BEAM_ABOVE, and STEM_UP properties into the
* notes in the group, as appropriate. Does not require tqlayout x
* notes in the group, as appropriate. Does not require layout x
* coordinates to have been set.
*/
void applyStemProperties();
/**
* Writes beam data into each note in the group. Notes' tqlayout x
* Writes beam data into each note in the group. Notes' layout x
* coordinates must already have been set. Does not require
* applyStemProperties to have already been called.
*/
@ -87,7 +87,7 @@ public:
/**
* Writes tupling line data into each note in the group. Notes'
* tqlayout x coordinates must already have been set. Does nothing
* layout x coordinates must already have been set. Does nothing
* if this is not a tupled group.
*/
void applyTuplingLine(NotationStaff &);

24
src/gui/editors/notation/NotationHLayout.cpp
Unescape View File

@ -1230,15 +1230,15 @@ NotationHLayout::finishLayout(timeT startTime, timeT endTime)
m_timePerProgressIncrement = timeCovered / (100 / m_barData.size());
tqlayout(i, startTime, endTime);
layout(i, startTime, endTime);
++staffNo;
}
}
void
NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime)
NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
{
Profiler profiler("NotationHLayout::tqlayout");
Profiler profiler("NotationHLayout::layout");
Staff &staff = *(i->first);
NotationElementList *notes = staff.getViewElementList();
@ -1251,7 +1251,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
// bool haveSimpleOffset = false;
// double simpleOffset = 0;
NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
double x = 0, barX = 0;
TieMap tieMap;
@ -1287,7 +1287,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
NotationElementList::iterator from = bdi->second.basicData.start;
NotationElementList::iterator to;
NOTATION_DEBUG << "NotationHLayout::tqlayout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
BarDataList::iterator nbdi(bdi);
if (++nbdi == barList.end()) {
@ -1307,10 +1307,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
double offset = barX - bdi->second.layoutData.x;
NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
if (offset > -0.1 && offset < 0.1) {
NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl;
continue;
}
@ -1323,7 +1323,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
it != to && it != notes->end(); ++it) {
NotationElement* nel = static_cast<NotationElement*>(*it);
NOTATION_DEBUG << "NotationHLayout::tqlayout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
nel->setLayoutX((*it)->getLayoutX() + offset);
double airX, airWidth;
nel->getLayoutAirspace(airX, airWidth);
@ -1342,7 +1342,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden();
}
if (timeSigToPlace) {
NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl;
}
bool repeatClefAndKey = false;
@ -1350,7 +1350,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
repeatClefAndKey = true;
}
if (repeatClefAndKey) {
NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl;
}
double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey);
@ -1467,7 +1467,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
}
}
NOTATION_DEBUG << "NotationHLayout::tqlayout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
double displacedX = 0.0;
long dxRaw = 0;
@ -1692,7 +1692,7 @@ NotationHLayout::positionChord(Staff &staff,
barEndsInChord = true;
// #704958 (multiple tuplet spanners created when entering
// triplet chord) -- tqlayout() updates the beamed group data
// triplet chord) -- layout() updates the beamed group data
// for non-notes, but we have to do it for notes so as to
// ensure every note in the chord is accounted for
sampleGroupElement(staff, clef, key, citr);

14
src/gui/editors/notation/NotationHLayout.h
Unescape View File

@ -56,7 +56,7 @@ class AccidentalTable;
/**
* Horizontal notation tqlayout
* Horizontal notation layout
*
* computes the X coordinates of notation elements
*/
@ -77,9 +77,9 @@ public:
}
/**
* Precomputes tqlayout data for a single staff. The resulting data
* Precomputes layout data for a single staff. The resulting data
* is stored in the BarDataMap, keyed from the staff reference;
* the entire map is then used by reconcileBars() and tqlayout().
* the entire map is then used by reconcileBars() and layout().
* The map should be cleared (by calling reset()) before a full
* set of staffs is preparsed.
*/
@ -167,7 +167,7 @@ public:
static std::vector<int> getAvailableProportions();
/**
* Returns the total length of all elements once tqlayout is done
* Returns the total length of all elements once layout is done
* This is the x-coord of the end of the last element on the longest
* staff, plus the space allocated to that element
*/
@ -211,7 +211,7 @@ public:
* Returns the X coord corresponding to the given time value.
* This RulerScale method works by interpolating between bar lines
* (the inverse of the way getTimeForX works), and should be used
* for any rulers associated with the tqlayout.
* for any rulers associated with the layout.
*/
virtual double getXForTime(timeT time) const;
@ -286,7 +286,7 @@ protected:
} sizeData;
struct LayoutData
{ // slots either assumed, or only known at tqlayout time
{ // slots either assumed, or only known at layout time
bool needsLayout;
double x; // coordinate for display of barline
int timeSigX;
@ -360,7 +360,7 @@ protected:
/// Tries to harmonize the bar positions for all the staves (page mode)
void reconcileBarsPage();
void tqlayout(BarDataMap::iterator,
void layout(BarDataMap::iterator,
timeT startTime,
timeT endTime);

2
src/gui/editors/notation/NotationStaff.cpp
Unescape View File

@ -379,7 +379,7 @@ NotationStaff::getClosestElementToLayoutX(double x,
return notes->end();
}
NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at tqlayout " << (*result)->getLayoutX() << " - we're at tqlayout " << x << endl;
NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at layout " << (*result)->getLayoutX() << " - we're at layout " << x << endl;
PRINT_ELAPSED("NotationStaff::getClosestElementToLayoutX");

18
src/gui/editors/notation/NotationStaff.h
Unescape View File

@ -136,14 +136,14 @@ public:
/**
* Assign suitable coordinates to the elements on the staff,
* based entirely on the tqlayout X and Y coordinates they were
* given by the horizontal and vertical tqlayout processes.
* based entirely on the layout X and Y coordinates they were
* given by the horizontal and vertical layout processes.
*
* This is necessary because the sprites that are being positioned
* may have been created either after the tqlayout process completed
* may have been created either after the layout process completed
* (by renderElements) or before (by the previous renderElements
* call, if the sprites are unchanged but have moved) -- so
* neither the tqlayout nor renderElements can authoritatively set
* neither the layout nor renderElements can authoritatively set
* their final positions.
*
* This method also updates the selected-ness of any elements it
@ -197,7 +197,7 @@ public:
* elements). Pass movedOnly as true to indicate that elements
* have not changed but only been repositioned, for example as a
* consequence of a modification on another staff that caused a
* retqlayout.
* relayout.
*/
virtual void markChanged(timeT from = 0,
timeT to = 0,
@ -270,7 +270,7 @@ public:
Accidentals::NoAccidental) const;
/**
* Find the NotationElement whose tqlayout x-coord is closest to x,
* Find the NotationElement whose layout x-coord is closest to x,
* without regard to its y-coord.
*
* If notesAndRestsOnly is true, will return the closest note
@ -289,7 +289,7 @@ public:
int proximityThreshold = 10);
/**
* Find the NotationElement "under" the given tqlayout x-coord,
* Find the NotationElement "under" the given layout x-coord,
* without regard to its y-coord.
*
* Also returns the clef and key in force at the given coordinates.
@ -396,7 +396,7 @@ protected:
* Returns true if the item at the given iterator appears to have
* moved horizontally without the spacing around it changing.
*
* In practice, calculates the offset between the intended tqlayout
* In practice, calculates the offset between the intended layout
* and current canvas coordinates of the item at the given
* iterator, and returns true if this offset is equal to those of
* all other following iterators at the same time as well as the
@ -412,7 +412,7 @@ protected:
/**
* Prepare a painter to draw an object of logical width w at
* tqlayout-x coord x, starting at offset dx into the object, by
* layout-x coord x, starting at offset dx into the object, by
* setting the painter's clipping so as to crop the object at the
* right edge of the row if it would otherwise overrun. The
* return value is the amount of the object visible on this row

6
src/gui/editors/notation/NotationVLayout.cpp
Unescape View File

@ -249,7 +249,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
bool hasShifted = chord.hasNoteHeadShifted();
double y0 = -1E50; // A very unlikely Y tqlayout value
double y0 = -1E50; // A very unlikely Y layout value
for (unsigned int j = 0; j < chord.size(); ++j) {
@ -269,7 +269,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
// These calculations and assignments are pretty much final
// if the chord is not in a beamed group, but if it is then
// they will be reworked by NotationGroup::applyBeam, which
// is called from NotationHLayout::tqlayout, which is called
// is called from NotationHLayout::layout, which is called
// after this. Any inaccuracies here for beamed groups
// should be stamped out there.
@ -342,7 +342,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT)
// Not optimal, as we can end up scanning the chord
// multiple times (we'll return to it after scanning the
// contained note). [We can't just iterate over all
// elements within the chord (as we can in htqlayout)
// elements within the chord (as we can in hlayout)
// because we need them in height order.]
i = chord.getFirstElementNotInChord();

8
src/gui/editors/notation/NotationVLayout.h
Unescape View File

@ -52,7 +52,7 @@ class Composition;
/**
* Vertical notation tqlayout
* Vertical notation layout
*
* computes the Y coordinate of notation elements
*/
@ -91,9 +91,9 @@ public:
timeT = 0);
/**
* Do any tqlayout dependent on more than one staff. As it
* happens, we have none, but we do have some tqlayout that
* depends on the final results from the horizontal tqlayout
* Do any layout dependent on more than one staff. As it
* happens, we have none, but we do have some layout that
* depends on the final results from the horizontal layout
* (for slurs), so we should do that here
*/
virtual void finishLayout(timeT = 0,

158
src/gui/editors/notation/NotationView.cpp
Unescape View File

@ -372,9 +372,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_pageMode(LinedStaff::LinearMode),
m_leftGutter(20),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
m_properties, TQT_TQOBJECT(this))),
m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
m_properties, TQT_TQOBJECT(this))),
m_chordNameRuler(0),
m_tempoRuler(0),
@ -409,7 +409,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
// Initialise the display-related defaults that will be needed
// by both the actions and the tqlayout toolbar
// by both the actions and the layout toolbar
m_config->setGroup(NotationViewConfigGroup);
@ -435,15 +435,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
NoteFontFactory::getDefaultSize(m_fontName));
int defaultSpacing = m_config->readNumEntry("spacing", 100);
m_htqlayout->setSpacing(defaultSpacing);
m_hlayout->setSpacing(defaultSpacing);
int defaultProportion = m_config->readNumEntry("proportion", 60);
m_htqlayout->setProportion(defaultProportion);
m_hlayout->setProportion(defaultProportion);
delete m_notePixmapFactory;
m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
setupActions();
// setupAddControlRulerMenu(); - too early for notation, moved to end of ctor.
@ -460,19 +460,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
updateViewCaption();
m_chordNameRuler = new ChordNameRuler
(m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
(m_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget());
addRuler(m_chordNameRuler);
if (showProgressive)
m_chordNameRuler->show();
m_tempoRuler = new TempoRuler
(m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
(m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget());
addRuler(m_tempoRuler);
m_tempoRuler->hide();
static_cast<TempoRuler *>(m_tempoRuler)->connectSignals();
m_rawNoteRuler = new RawNoteRuler
(m_htqlayout, segments[0], m_leftGutter, 20, getCentralWidget());
(m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget());
addRuler(m_rawNoteRuler);
m_rawNoteRuler->show();
@ -484,7 +484,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
readOptions();
setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, m_leftGutter, 25,
setBottomStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25,
true, getBottomWidget()));
for (unsigned int i = 0; i < segments.size(); ++i)
@ -506,7 +506,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_canvasView->setLeftFixedWidget(m_headersGroupView);
// Add a close button just above the track headers.
// The grid tqlayout is only here to maintain the button in a
// The grid layout is only here to maintain the button in a
// right place
m_headersTopFrame = new TQFrame(getCentralWidget());
TQGridLayout * headersTopGrid
@ -522,7 +522,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
TQToolTip::add(hideHeadersButton, i18n("Close track headers"));
headersTopGrid->setMargin(4);
setTopStandardRuler(new StandardRuler(getDocument(),
m_htqlayout, m_leftGutter, 25,
m_hlayout, m_leftGutter, 25,
false, getCentralWidget()), m_headersTopFrame);
m_topStandardRuler->getLoopRuler()->setBackgroundColor
@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
//
// tqlayout
// layout
//
ProgressDialog* progressDlg = 0;
@ -594,7 +594,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
} catch (ProgressReporter::Cancelled c)
{
// when cancelled, m_ok is false -- checked by calling method
NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
}
NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@ -817,9 +817,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_pageMode(LinedStaff::LinearMode),
m_leftGutter(0),
m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)),
m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory,
m_properties, TQT_TQOBJECT(this))),
m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory,
m_properties, TQT_TQOBJECT(this))),
m_chordNameRuler(0),
m_tempoRuler(0),
@ -850,7 +850,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
// Initialise the display-related defaults that will be needed
// by both the actions and the tqlayout toolbar
// by both the actions and the layout toolbar
m_config->setGroup(NotationViewConfigGroup);
@ -871,20 +871,20 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
if (referenceView)
{
m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing());
m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion());
m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing());
m_hlayout->setProportion(referenceView->m_hlayout->getProportion());
} else
{
int defaultSpacing = m_config->readNumEntry("spacing", 100);
m_htqlayout->setSpacing(defaultSpacing);
m_hlayout->setSpacing(defaultSpacing);
int defaultProportion = m_config->readNumEntry("proportion", 60);
m_htqlayout->setProportion(defaultProportion);
m_hlayout->setProportion(defaultProportion);
}
delete m_notePixmapFactory;
m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize);
m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
setBackgroundMode(PaletteBase);
m_config->setGroup(NotationViewConfigGroup);
@ -939,7 +939,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
} catch (ProgressReporter::Cancelled c)
{
// when cancelled, m_ok is false -- checked by calling method
NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl;
NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl;
}
NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl;
@ -1223,7 +1223,7 @@ void NotationView::positionStaffs()
}
}
m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
int topGutter = 0;
@ -1549,7 +1549,7 @@ void NotationView::setupActions()
KActionMenu *spacingActionMenu =
new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu");
int defaultSpacing = m_htqlayout->getSpacing();
int defaultSpacing = m_hlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
for (std::vector<int>::iterator i = spacings.begin();
@ -1571,7 +1571,7 @@ void NotationView::setupActions()
KActionMenu *proportionActionMenu =
new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu");
int defaultProportion = m_htqlayout->getProportion();
int defaultProportion = m_hlayout->getProportion();
std::vector<int> proportions = NotationHLayout::getAvailableProportions();
for (std::vector<int>::iterator i = proportions.begin();
@ -1820,7 +1820,7 @@ void NotationView::setupActions()
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.xpm");
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm");
icon = TQIconSet(pixmap);
KRadioAction *linearModeAction = new KRadioAction
(i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
@ -2611,7 +2611,7 @@ void NotationView::initLayoutToolbar()
if (!layoutToolbar) {
std::cerr
<< "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
<< "NotationView::initLayoutToolbar() : layout toolbar not found"
<< std::endl;
return ;
}
@ -2679,7 +2679,7 @@ void NotationView::initLayoutToolbar()
//
// spacing combo
//
int defaultSpacing = m_htqlayout->getSpacing();
int defaultSpacing = m_hlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
@ -2786,17 +2786,17 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
int topMargin = 0, leftMargin = 0;
getPageMargins(leftMargin, topMargin);
m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode);
m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
m_hlayout->setPageMode(pageMode != LinedStaff::LinearMode);
m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to "
NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to "
<< (pageWidth - leftMargin * 2) << endl;
positionStaffs();
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
KMessageBox::sorry(0, "Couldn't apply layout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
m_staffs[i]->markChanged();
@ -2894,7 +2894,7 @@ void
NotationView::scrollToTime(timeT t)
{
double notationViewLayoutCoord = m_htqlayout->getXForTime(t);
double notationViewLayoutCoord = m_hlayout->getXForTime(t);
// Doesn't appear to matter which staff we use
//!!! actually it probably does matter, if they don't have the same extents
@ -2912,7 +2912,7 @@ NotationView::scrollToTime(timeT t)
RulerScale*
NotationView::getHLayout()
{
return m_htqlayout;
return m_hlayout;
}
void
@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e)
getPageMargins(leftMargin, topMargin);
if (m_pageMode == LinedStaff::ContinuousPageMode) {
// retqlayout if the window width changes significantly in continuous page mode
int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth());
// relayout if the window width changes significantly in continuous page mode
int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth());
if (diff < -10 || diff > 10) {
setPageMode(m_pageMode);
refreshSegment(0, 0, 0);
@ -2998,7 +2998,7 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
slotSetOperationNameAndStatus(i18n("Laying out score..."));
ProgressDialog::processEvents();
m_htqlayout->setStaffCount(m_staffs.size());
m_hlayout->setStaffCount(m_staffs.size());
Profiler profiler("NotationView::applyLayout");
unsigned int i;
@ -3011,17 +3011,17 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime)
slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1));
ProgressDialog::processEvents();
m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime);
m_vtqlayout->resetStaff(*m_staffs[i], startTime, endTime);
m_htqlayout->scanStaff(*m_staffs[i], startTime, endTime);
m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime);
m_hlayout->resetStaff(*m_staffs[i], startTime, endTime);
m_vlayout->resetStaff(*m_staffs[i], startTime, endTime);
m_hlayout->scanStaff(*m_staffs[i], startTime, endTime);
m_vlayout->scanStaff(*m_staffs[i], startTime, endTime);
}
slotSetOperationNameAndStatus(i18n("Reconciling staffs..."));
ProgressDialog::processEvents();
m_htqlayout->finishLayout(startTime, endTime);
m_vtqlayout->finishLayout(startTime, endTime);
m_hlayout->finishLayout(startTime, endTime);
m_vlayout->finishLayout(startTime, endTime);
// find the last finishing staff for future use
@ -3349,10 +3349,10 @@ void NotationView::setNotePixmapFactory(NotePixmapFactory* f)
{
delete m_notePixmapFactory;
m_notePixmapFactory = f;
if (m_htqlayout)
m_htqlayout->setNotePixmapFactory(m_notePixmapFactory);
if (m_vtqlayout)
m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory);
if (m_hlayout)
m_hlayout->setNotePixmapFactory(m_notePixmapFactory);
if (m_vlayout)
m_vlayout->setNotePixmapFactory(m_notePixmapFactory);
}
Segment *
@ -3469,7 +3469,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
LinedStaff::LinedStaffCoords coords =
s->getLayoutCoordsForCanvasCoords(x, y);
timeT t = m_htqlayout->getTimeForX(coords.first);
timeT t = m_hlayout->getTimeForX(coords.first);
// In order to find the correct starting and ending bar of the segment,
// make infinitesimal shifts (+1 and -1) towards its center.
timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[m_currentStaff]->getSegment().getStartTime()+1);
@ -3488,7 +3488,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const
LinedStaff::LinedStaffCoords coords =
s->getLayoutCoordsForCanvasCoords(x, y);
timeT t = m_htqlayout->getTimeForX(coords.first);
timeT t = m_hlayout->getTimeForX(coords.first);
// In order to find the correct starting and ending bar of the segment,
// make infinitesimal shifts (+1 and -1) towards its center.
timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[i]->getSegment().getStartTime()+1);
@ -3589,8 +3589,8 @@ void NotationView::print(bool previewOnly)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
timeT t0 = m_htqlayout->getTimeForX(cc0.first);
timeT t1 = m_htqlayout->getTimeForX(cc1.first);
timeT t0 = m_hlayout->getTimeForX(cc0.first);
timeT t1 = m_hlayout->getTimeForX(cc1.first);
m_staffs[i]->setPrintPainter(&printpainter);
m_staffs[i]->checkRendered(t0, t1);
@ -3629,8 +3629,8 @@ void NotationView::print(bool previewOnly)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height());
timeT t0 = m_htqlayout->getTimeForX(cc0.first);
timeT t1 = m_htqlayout->getTimeForX(cc1.first);
timeT t0 = m_hlayout->getTimeForX(cc0.first);
timeT t1 = m_hlayout->getTimeForX(cc1.first);
m_staffs[i]->renderPrintable(t0, t1);
}
@ -3886,7 +3886,7 @@ void NotationView::readjustCanvasSize()
LinedStaff &staff = *m_staffs[i];
staff.sizeStaff(*m_htqlayout);
staff.sizeStaff(*m_hlayout);
UPDATE_PROGRESS(1);
if (staff.getTotalWidth() + staff.getX() > maxWidth) {
@ -4110,10 +4110,10 @@ void NotationView::setupProgress(KProgress* bar)
if (bar) {
NOTATION_DEBUG << "NotationView::setupProgress(bar)\n";
connect(m_htqlayout, TQT_SIGNAL(setProgress(int)),
connect(m_hlayout, TQT_SIGNAL(setProgress(int)),
bar, TQT_SLOT(setValue(int)));
connect(m_htqlayout, TQT_SIGNAL(incrementProgress(int)),
connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)),
bar, TQT_SLOT(advance(int)));
connect(this, TQT_SIGNAL(setProgress(int)),
@ -4142,7 +4142,7 @@ void NotationView::setupProgress(ProgressDialog* dialog)
setupProgress(dialog->progressBar());
connect(dialog, TQT_SIGNAL(cancelClicked()),
m_htqlayout, TQT_SLOT(slotCancel()));
m_hlayout, TQT_SLOT(slotCancel()));
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)),
@ -4170,7 +4170,7 @@ void NotationView::disconnectProgress()
{
NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl;
m_htqlayout->disconnect();
m_hlayout->disconnect();
disconnect(TQT_SIGNAL(setProgress(int)));
disconnect(TQT_SIGNAL(incrementProgress(int)));
disconnect(TQT_SIGNAL(setOperationName(TQString)));
@ -4324,10 +4324,10 @@ NotationView::slotChangeSpacingFromAction()
void
NotationView::slotChangeSpacing(int spacing)
{
if (m_htqlayout->getSpacing() == spacing)
if (m_hlayout->getSpacing() == spacing)
return ;
m_htqlayout->setSpacing(spacing);
m_hlayout->setSpacing(spacing);
// m_spacingSlider->setSize(spacing);
@ -4357,7 +4357,7 @@ NotationView::slotChangeSpacing(int spacing)
void
NotationView::slotChangeProportionFromIndex(int n)
{
std::vector<int> proportions = m_htqlayout->getAvailableProportions();
std::vector<int> proportions = m_hlayout->getAvailableProportions();
if (n >= (int)proportions.size())
n = proportions.size() - 1;
slotChangeProportion(proportions[n]);
@ -4382,10 +4382,10 @@ NotationView::slotChangeProportionFromAction()
void
NotationView::slotChangeProportion(int proportion)
{
if (m_htqlayout->getProportion() == proportion)
if (m_hlayout->getProportion() == proportion)
return ;
m_htqlayout->setProportion(proportion);
m_hlayout->setProportion(proportion);
// m_proportionSlider->setSize(proportion);
@ -4581,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
int topMargin = 0, leftMargin = 0;
getPageMargins(leftMargin, topMargin);
m_htqlayout->setPageWidth(pageWidth - leftMargin * 2);
m_hlayout->setPageWidth(pageWidth - leftMargin * 2);
}
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@ -4594,7 +4594,7 @@ NotationView::slotChangeFont(std::string newName, int newSize)
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
KMessageBox::sorry(0, "Couldn't apply layout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
m_staffs[i]->markChanged();
@ -6438,22 +6438,22 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
double layoutX = m_htqlayout->getXForTimeByEvent(time);
double layoutX = m_hlayout->getXForTimeByEvent(time);
Segment &seg = m_staffs[i]->getSegment();
bool good = true;
if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) {
if (seg.isRepeating() && time < seg.getRepeatEndTime()) {
timeT mappedTime =
seg.getStartTime() +
((time - seg.getStartTime()) %
(seg.getEndMarkerTime() - seg.getStartTime()));
layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
layoutX = m_hlayout->getXForTimeByEvent(mappedTime);
} else {
good = false;
}
} else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
} else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) {
good = false;
}
@ -6750,7 +6750,7 @@ NotationView::doDeferredCursorMove()
t == segment.getEndTime() ||
t == segment.getBarStartForTime(t)) {
staff->setInsertCursorPosition(*m_htqlayout, t);
staff->setInsertCursorPosition(*m_hlayout, t);
if (type == CursorMoveAndMakeVisible) {
double cx;
@ -6976,21 +6976,21 @@ void NotationView::slotMultiPageMode()
void NotationView::slotToggleChordsRuler()
{
if (m_htqlayout->isPageMode())
if (m_hlayout->isPageMode())
return ;
toggleWidget(m_chordNameRuler, "show_chords_ruler");
}
void NotationView::slotToggleRawNoteRuler()
{
if (m_htqlayout->isPageMode())
if (m_hlayout->isPageMode())
return ;
toggleWidget(m_rawNoteRuler, "show_raw_note_ruler");
}
void NotationView::slotToggleTempoRuler()
{
if (m_htqlayout->isPageMode())
if (m_hlayout->isPageMode())
return ;
toggleWidget(m_tempoRuler, "show_tempo_ruler");
}
@ -7116,7 +7116,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
} else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
emit editTimeSignature(m_hlayout->getTimeForX(layoutX));
}
}
@ -7396,8 +7396,8 @@ NotationView::slotCheckRendered(double cx0, double cx1)
LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords
(cx1, staff->getTotalHeight() + staff->getY());
timeT t0 = m_htqlayout->getTimeForX(cc0.first);
timeT t1 = m_htqlayout->getTimeForX(cc1.first);
timeT t0 = m_hlayout->getTimeForX(cc0.first);
timeT t1 = m_hlayout->getTimeForX(cc1.first);
if (dynamic_cast<NotationStaff *>(staff)->checkRendered(t0, t1)) {
something = true; //!!!

38
src/gui/editors/notation/NotationView.h
Unescape View File

@ -274,13 +274,13 @@ public:
/// Sound the given note
void playNote(Segment &segment, int pitch, int velocity = -1);
/// Switches between page- and linear- tqlayout modes
/// Switches between page- and linear- layout modes
void setPageMode(LinedStaff::PageMode mode);
/// Returns the page width according to the tqlayout mode (page/linear)
/// Returns the page width according to the layout mode (page/linear)
int getPageWidth();
/// Returns the page height according to the tqlayout mode (page/linear)
/// Returns the page height according to the layout mode (page/linear)
int getPageHeight();
/// Returns the margins within the page (zero if not in MultiPageMode)
@ -310,7 +310,7 @@ public:
/**
* Render segments on printing painter. This uses the current
* font size and tqlayout, rather than the optimal ones for the
* font size and layout, rather than the optimal ones for the
* printer configuration (notation editing is not quite WYSIWYG,
* and we may be in a non-page mode).
*
@ -446,7 +446,7 @@ public slots:
void slotToggleGroupToolBar();
/**
* toggles the tqlayout toolbar
* toggles the layout toolbar
*/
void slotToggleLayoutToolBar();
@ -773,22 +773,22 @@ public slots:
/// Changes to the next font size down
void slotZoomOut();
/// Changes the htqlayout spacing of the staffs on the view
/// Changes the hlayout spacing of the staffs on the view
void slotChangeSpacing(int newSpacing);
/// Changes the htqlayout spacing of the staffs on the view
/// Changes the hlayout spacing of the staffs on the view
void slotChangeSpacingFromStringValue(const TQString&);
/// Changes the htqlayout spacing of the staffs on the view
/// Changes the hlayout spacing of the staffs on the view
void slotChangeSpacingFromAction();
/// Changes the htqlayout proportion of the staffs on the view
/// Changes the hlayout proportion of the staffs on the view
void slotChangeProportion(int newProportion);
/// Changes the htqlayout proportion of the staffs on the view
/// Changes the hlayout proportion of the staffs on the view
void slotChangeProportionFromIndex(int newProportionIndex);
/// Changes the htqlayout proportion of the staffs on the view
/// Changes the hlayout proportion of the staffs on the view
void slotChangeProportionFromAction();
/// Note-on received asynchronously -- consider step-by-step editing
@ -912,13 +912,13 @@ protected:
virtual void initStatusBar();
/**
* Place the staffs at the correct x & y coordinates (before tqlayout)
* Place the staffs at the correct x & y coordinates (before layout)
*/
void positionStaffs();
/**
* Place the page pixmaps (if any) at the correct x & y
* coordinates (after tqlayout)
* coordinates (after layout)
*/
void positionPages();
@ -929,7 +929,7 @@ protected:
void updateThumbnails(bool complete);
/**
* setup the tqlayout/font toolbar
* setup the layout/font toolbar
*/
void initLayoutToolbar();
@ -940,15 +940,15 @@ protected:
*/
void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0);
/// Calls all the relevant preparse and tqlayout methods
/// Calls all the relevant preparse and layout methods
virtual bool applyLayout(int staffNo = -1,
timeT startTime = 0,
timeT endTime = 0);
/**
* Readjust the size of the canvas after a tqlayout
* Readjust the size of the canvas after a layout
*
* Checks the total width computed by the horizontal tqlayout
* Checks the total width computed by the horizontal layout
*
* @see NotationHLayout#getTotalWidth()
*/
@ -1074,8 +1074,8 @@ protected:
NotePixmapFactory *m_notePixmapFactory;
NotationHLayout* m_htqlayout;
NotationVLayout* m_vtqlayout;
NotationHLayout* m_hlayout;
NotationVLayout* m_vlayout;
ChordNameRuler *m_chordNameRuler;
TQWidget *m_tempoRuler;

4
src/gui/editors/parameters/InstrumentParameterBox.cpp
Unescape View File

@ -122,8 +122,8 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
// Layout the groups left to right.
TQBoxLayout* tqlayout = new TQVBoxLayout(this);
tqlayout->addWidget(m_widgetStack);
TQBoxLayout* layout = new TQVBoxLayout(this);
layout->addWidget(m_widgetStack);
}

2
src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
Unescape View File

@ -787,7 +787,7 @@ MIDIInstrumentParameterPanel::populateVariationList()
}
} else {
//!!! seem to have problems here -- the grid tqlayout doesn't
//!!! seem to have problems here -- the grid layout doesn't
//like us adding stuff in the middle so if we go from 1
//visible row (say program) to 2 (program + variation) the
//second one overlaps the control knobs

4
src/gui/editors/parameters/RosegardenParameterArea.cpp
Unescape View File

@ -89,12 +89,12 @@ void RosegardenParameterArea::addRosegardenParameterBox(
b->sizeHint().width()) + 8);
// Create a titled group box for the parameter box, parented by the
// classic tqlayout widget, so that it can be used to provide a title
// classic layout widget, so that it can be used to provide a title
// and outline, in classic mode. Add this container to an array that
// parallels the above array of parameter boxes.
TQVGroupBox *box = new TQVGroupBox(b->getLongLabel(), m_classic);
box->tqlayout()->setMargin( 4 ); // about half the default value
box->layout()->setMargin( 4 ); // about half the default value
TQFont f;
f.setBold( true );
box->setFont( f );

4
src/gui/editors/parameters/RosegardenParameterArea.h
Unescape View File

@ -72,13 +72,13 @@ public:
TAB_BOX_STYLE // A horizontal list of tabs, displaying one box at a time.
};
// Redisplay the widgets with a different tqlayout style.
// Redisplay the widgets with a different layout style.
void setArrangement(Arrangement style);
protected:
private:
Arrangement m_style; // The current tqlayout style.
Arrangement m_style; // The current layout style.
// The list of parameter box widgets that are being displayed by this
// widget.

10
src/gui/editors/parameters/RosegardenParameterBox.h
Unescape View File

@ -43,7 +43,7 @@ namespace Rosegarden
/**
* A flat TQFrame, in which a group of parameters can be laid out.
* Virtual method functions are defined for for requesting a tqlayout
* Virtual method functions are defined for for requesting a layout
* style, and returning the single-word to use for labelling the
* box.
*/
@ -72,11 +72,11 @@ public:
protected:
void init();
// List the tqlayout styles that may be requested via a call to setStyle().
// List the layout styles that may be requested via a call to setStyle().
enum LayoutMode {
LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow parent.
PORTRAIT_MODE // Optimize the tqlayout for a short and wide parent.
LANDSCAPE_MODE, // Optimize the layout for a tall and narrow parent.
PORTRAIT_MODE // Optimize the layout for a short and wide parent.
};
void setLayoutMode(LayoutMode mode);
@ -84,7 +84,7 @@ protected:
TQFont m_font;
TQString m_shortLabel; // The string that containers can use for labelling and identification
TQString m_longLabel; // The full title
LayoutMode m_mode; // The current tqlayout mode.
LayoutMode m_mode; // The current layout mode.
};

14
src/gui/editors/segment/ControlEditorDialog.cpp
Unescape View File

@ -124,7 +124,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
btnBox->setSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@ -143,13 +143,13 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
(m_closeButton,
i18n("Close the Control Parameter editor"));
tqlayout->addStretch(10);
tqlayout->addWidget(m_addButton);
tqlayout->addWidget(m_deleteButton);
tqlayout->addSpacing(30);
layout->addStretch(10);
layout->addWidget(m_addButton);
layout->addWidget(m_deleteButton);
layout->addSpacing(30);
tqlayout->addWidget(m_closeButton);
tqlayout->addSpacing(5);
layout->addWidget(m_closeButton);
layout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));

40
src/gui/editors/segment/ControlParameterEditDialog.cpp
Unescape View File

@ -72,47 +72,47 @@ ControlParameterEditDialog::ControlParameterEditDialog(
TQFrame *frame = new TQFrame(groupBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
tqlayout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
layout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
m_nameEdit = new TQLineEdit(frame);
tqlayout->addWidget(m_nameEdit, 0, 1);
layout->addWidget(m_nameEdit, 0, 1);
tqlayout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
layout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
m_typeCombo = new KComboBox(frame);
tqlayout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
layout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
layout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
m_description = new TQLineEdit(frame);
tqlayout->addMultiCellWidget(m_description, 2, 2, 1, 2);
layout->addMultiCellWidget(m_description, 2, 2, 1, 2);
// hex value alongside decimal value
m_hexValue = new TQLabel(frame);
tqlayout->addWidget(m_hexValue, 3, 1);
layout->addWidget(m_hexValue, 3, 1);
tqlayout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
layout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
m_controllerBox = new TQSpinBox(frame);
tqlayout->addWidget(m_controllerBox, 3, 2);
layout->addWidget(m_controllerBox, 3, 2);
tqlayout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
layout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
m_minBox = new TQSpinBox(frame);
tqlayout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
layout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
tqlayout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
layout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
m_maxBox = new TQSpinBox(frame);
tqlayout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
layout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
tqlayout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
layout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
m_defaultBox = new TQSpinBox(frame);
tqlayout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
layout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
tqlayout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
layout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
m_colourCombo = new KComboBox(frame);
tqlayout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
layout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
tqlayout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
layout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
m_ipbPosition = new KComboBox(frame);
tqlayout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotNameChanged(const TQString&)));

16
src/gui/editors/segment/MarkerEditor.cpp
Unescape View File

@ -108,7 +108,7 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
btnBox->setSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@ -132,14 +132,14 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
(m_closeButton,
i18n("Close the Marker Editor"));
tqlayout->addStretch(10);
tqlayout->addWidget(m_addButton);
tqlayout->addWidget(m_deleteButton);
tqlayout->addWidget(m_deleteAllButton);
tqlayout->addSpacing(30);
layout->addStretch(10);
layout->addWidget(m_addButton);
layout->addWidget(m_deleteButton);
layout->addWidget(m_deleteAllButton);
layout->addSpacing(30);
tqlayout->addWidget(m_closeButton);
tqlayout->addSpacing(5);
layout->addWidget(m_closeButton);
layout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));

26
src/gui/editors/segment/TrackButtons.cpp
Unescape View File

@ -77,7 +77,7 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
WFlags f)
: TQFrame(parent, name, f),
m_doc(doc),
m_tqlayout(new TQVBoxLayout(this)),
m_layout(new TQVBoxLayout(this)),
m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
@ -100,13 +100,13 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
// Set the spacing between vertical elements
//
m_tqlayout->setSpacing(m_borderGap);
m_layout->setSpacing(m_borderGap);
// Now draw the buttons and labels and meters
//
makeButtons();
m_tqlayout->addStretch(20);
m_layout->addStretch(20);
connect(m_recordSigMapper, TQT_SIGNAL(mapped(int)),
this, TQT_SLOT(slotToggleRecordTrack(int)));
@ -152,7 +152,7 @@ TrackButtons::makeButtons()
TQFrame *trackHBox = makeButton(track->getId());
if (trackHBox) {
m_tqlayout->addWidget(trackHBox);
m_layout->addWidget(trackHBox);
m_trackHBoxes.push_back(trackHBox);
}
}
@ -297,7 +297,7 @@ TrackButtons::slotUpdateTracks()
if (trackHBox) {
trackHBox->show();
m_tqlayout->insertWidget(i, trackHBox);
m_layout->insertWidget(i, trackHBox);
m_trackHBoxes.push_back(trackHBox);
}
} else
@ -1021,7 +1021,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
// Create a horizontal box for each track
//
trackHBox = new TQFrame(this);
TQHBoxLayout *hbtqlayout = new TQHBoxLayout(trackHBox);
TQHBoxLayout *hblayout = new TQHBoxLayout(trackHBox);
trackHBox->setMinimumSize(labelWidth, m_cellSize * multiple - m_borderGap);
trackHBox->setFixedHeight(m_cellSize * multiple - m_borderGap);
@ -1033,7 +1033,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
trackHBox->setFrameShadow(Raised);
// Insert a little gap
hbtqlayout->addSpacing(vuSpacing);
hblayout->addSpacing(vuSpacing);
// Create a VU meter
vuMeter = new TrackVUMeter(trackHBox,
@ -1044,10 +1044,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_trackMeters.push_back(vuMeter);
hbtqlayout->addWidget(vuMeter);
hblayout->addWidget(vuMeter);
// Create another little gap
hbtqlayout->addSpacing(vuSpacing);
hblayout->addSpacing(vuSpacing);
//
// 'mute' and 'record' leds
@ -1056,12 +1056,12 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
mute = new KLedButton(Rosegarden::GUIPalette::getColour
(Rosegarden::GUIPalette::MuteTrackLED), trackHBox);
TQToolTip::add(mute, i18n("Mute track"));
hbtqlayout->addWidget(mute);
hblayout->addWidget(mute);
record = new KLedButton(Rosegarden::GUIPalette::getColour
(Rosegarden::GUIPalette::RecordMIDITrackLED), trackHBox);
TQToolTip::add(record, i18n("Record on this track"));
hbtqlayout->addWidget(record);
hblayout->addWidget(record);
record->setLook(KLed::Sunken);
mute->setLook(KLed::Sunken);
@ -1084,8 +1084,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
// Track label
//
trackLabel = new TrackLabel(trackId, track->getPosition(), trackHBox);
hbtqlayout->addWidget(trackLabel);
hbtqlayout->addSpacing(vuSpacing);
hblayout->addWidget(trackLabel);
hblayout->addSpacing(vuSpacing);
if (track->getLabel() == std::string("")) {
Rosegarden::Instrument *ins =

2
src/gui/editors/segment/TrackButtons.h
Unescape View File

@ -186,7 +186,7 @@ protected:
RosegardenGUIDoc *m_doc;
TQVBoxLayout *m_tqlayout;
TQVBoxLayout *m_layout;
std::vector<KLedButton *> m_muteLeds;
std::vector<KLedButton *> m_recordLeds;

16
src/gui/editors/segment/TriggerSegmentManager.cpp
Unescape View File

@ -102,7 +102,7 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
btnBox->setSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@ -126,14 +126,14 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
(m_closeButton,
i18n("Close the Triggered Segment Manager"));
tqlayout->addStretch(10);
tqlayout->addWidget(m_addButton);
tqlayout->addWidget(m_deleteButton);
tqlayout->addWidget(m_deleteAllButton);
tqlayout->addSpacing(30);
layout->addStretch(10);
layout->addWidget(m_addButton);
layout->addWidget(m_deleteButton);
layout->addWidget(m_deleteAllButton);
layout->addSpacing(30);
tqlayout->addWidget(m_closeButton);
tqlayout->addSpacing(5);
layout->addWidget(m_closeButton);
layout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));

4
src/gui/general/EditView.cpp
Unescape View File

@ -138,7 +138,7 @@ EditView::EditView(RosegardenGUIDoc *doc,
connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)),
this, TQT_SLOT(slotRemoveControlRuler(TQWidget*)));
(dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->setDirection(TQBoxLayout::BottomToTop);
(dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop);
// m_rulerBoxFiller is a white label used to keep m_rulerBox exactly
// above the scrolling part of the view (and never above the
@ -169,7 +169,7 @@ EditView::~EditView()
void EditView::updateBottomWidgetGeometry()
{
getBottomWidget()->tqlayout()->invalidate();
getBottomWidget()->layout()->invalidate();
getBottomWidget()->updateGeometry();
getCanvasView()->updateBottomWidgetGeometry();
}

6
src/gui/general/EditViewBase.cpp
Unescape View File

@ -311,7 +311,7 @@ EditViewBase::makeViewLocalPropertyPrefix()
void EditViewBase::paintEvent(TQPaintEvent* e)
{
// It is possible for this function to be called re-entrantly,
// because a re-tqlayout procedure may deliberately ask the event
// because a re-layout procedure may deliberately ask the event
// loop to process some more events so as to keep the GUI looking
// responsive. If that happens, we remember the events that came
// in in the middle of one paintEvent call and process their union
@ -362,7 +362,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
//
// If we have more than one segment modified, we need to update
// them all at once with the same time range, otherwise we can run
// into problems when the tqlayout of one depends on the others. So
// into problems when the layout of one depends on the others. So
// we use updateStart/End to calculate a bounding range for all
// modifications.
@ -379,7 +379,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e)
if (refreshStatus.needsRefresh() && isCompositionModified()) {
// if composition is also modified, retqlayout everything
// if composition is also modified, relayout everything
refreshSegment(0);
segmentsToUpdate = 0;
break;

30
src/gui/general/LinedStaff.cpp
Unescape View File

@ -572,7 +572,7 @@ LinedStaff::getCanvasXForLeftOfRow(int row) const
}
void
LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
LinedStaff::sizeStaff(HorizontalLayoutEngine &layout)
{
Profiler profiler("LinedStaff::sizeStaff", true);
@ -582,19 +582,19 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
// RG_DEBUG << "LinedStaff::sizeStaff" << endl;
int lastBar = tqlayout.getLastVisibleBarOnStaff(*this);
int lastBar = layout.getLastVisibleBarOnStaff(*this);
double xleft = 0, xright = 0;
bool haveXLeft = false;
xright = tqlayout.getBarPosition(lastBar) - 1;
xright = layout.getBarPosition(lastBar) - 1;
TimeSignature currentTimeSignature;
for (int barNo = tqlayout.getFirstVisibleBarOnStaff(*this);
for (int barNo = layout.getFirstVisibleBarOnStaff(*this);
barNo <= lastBar; ++barNo) {
double x = tqlayout.getBarPosition(barNo);
double x = layout.getBarPosition(barNo);
if (!haveXLeft) {
xleft = x;
@ -603,7 +603,7 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
double timeSigX = 0;
TimeSignature timeSig;
bool isNew = tqlayout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
bool isNew = layout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX);
if (isNew && barNo < lastBar) {
currentTimeSignature = timeSig;
@ -619,8 +619,8 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout)
insertBar(x,
((barNo == lastBar) ? 0 :
(tqlayout.getBarPosition(barNo + 1) - x)),
tqlayout.isBarCorrectOnStaff(*this, barNo - 1),
(layout.getBarPosition(barNo + 1) - x)),
layout.isBarCorrectOnStaff(*this, barNo - 1),
currentTimeSignature,
barNo,
showBarNo);
@ -745,7 +745,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
else
line->show();
// The bar lines have to be in order of tqlayout-x (there's no
// The bar lines have to be in order of layout-x (there's no
// such interesting stipulation for beat or connecting lines)
BarLineList::iterator insertPoint = lower_bound
(m_barLines.begin(), m_barLines.end(), line, compareBars);
@ -1110,10 +1110,10 @@ LinedStaff::getLayoutXOfInsertCursor() const
}
timeT
LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &tqlayout) const
LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &layout) const
{
if (m_insertCursorTimeValid) return m_insertCursorTime;
return tqlayout.getTimeForX(getLayoutXOfInsertCursor());
return layout.getTimeForX(getLayoutXOfInsertCursor());
}
void
@ -1141,10 +1141,10 @@ LinedStaff::setPointerPosition(double canvasX, int canvasY)
}
void
LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
LinedStaff::setPointerPosition(HorizontalLayoutEngine &layout,
timeT time)
{
setPointerPosition(tqlayout.getXForTime(time));
setPointerPosition(layout.getXForTime(time));
}
void
@ -1176,10 +1176,10 @@ LinedStaff::setInsertCursorPosition(double canvasX, int canvasY)
}
void
LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &tqlayout,
LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &layout,
timeT time)
{
double x = tqlayout.getXForTime(time);
double x = layout.getXForTime(time);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(x, 0);
setInsertCursorPosition(coords.first, coords.second);
m_insertCursorTime = time;

50
src/gui/general/LinedStaff.h
Unescape View File

@ -87,7 +87,7 @@ public:
protected:
/**
* Create a new LinedStaff for the given Segment, with a
* linear tqlayout.
* linear layout.
*
* \a id is an arbitrary id for the staff in its view,
* not used within the LinedStaff implementation but
@ -104,7 +104,7 @@ protected:
/**
* Create a new LinedStaff for the given Segment, with a
* page tqlayout.
* page layout.
*
* \a id is an arbitrary id for the staff in its view,
* not used within the LinedStaff implementation but
@ -117,7 +117,7 @@ protected:
* staff line should be
*
* \a pageWidth is the width of a page, to determine
* when to break lines for page tqlayout
* when to break lines for page layout
*
* \a rowsPerPage is the number of rows to a page, or zero
* for a single continuous page
@ -131,7 +131,7 @@ protected:
/**
* Create a new LinedStaff for the given Segment, with
* either page or linear tqlayout.
* either page or linear layout.
*/
LinedStaff(TQCanvas *, Segment *, SnapGrid *,
int id, int resolution, int lineThickness, PageMode pageMode,
@ -304,14 +304,14 @@ public:
virtual int getTitleHeight() const;
/**
* Returns the width of the entire staff after tqlayout. Call
* Returns the width of the entire staff after layout. Call
* this only after you've done the full sizeStaff/positionElements
* procedure.
*/
virtual double getTotalWidth() const;
/**
* Returns the height of the entire staff after tqlayout. Call
* Returns the height of the entire staff after layout. Call
* this only after you've done the full sizeStaff/positionElements
* procedure. If there are multiple rows, this will be the
* height of all rows, including any space between rows that
@ -383,26 +383,26 @@ public:
virtual void setCurrent(bool current);
/**
* Move the playback pointer to the tqlayout-X coordinate
* Move the playback pointer to the layout-X coordinate
* corresponding to the given time, and show it.
*/
virtual void setPointerPosition
(HorizontalLayoutEngine&, timeT);
/**
* Move the playback pointer to the tqlayout-X coordinate
* Move the playback pointer to the layout-X coordinate
* corresponding to the given canvas coordinates, and show it.
*/
virtual void setPointerPosition(double x, int y);
/**
* Move the playback pointer to the given tqlayout-X
* Move the playback pointer to the given layout-X
* coordinate, and show it.
*/
virtual void setPointerPosition(double x);
/**
* Returns the tqlayout-X coordinate corresponding to the current
* Returns the layout-X coordinate corresponding to the current
* position of the playback pointer.
*/
virtual double getLayoutXOfPointer() const;
@ -419,19 +419,19 @@ public:
virtual void hidePointer();
/**
* Move the insertion cursor to the tqlayout-X coordinate
* Move the insertion cursor to the layout-X coordinate
* corresponding to the given time, and show it.
*/
virtual void setInsertCursorPosition(HorizontalLayoutEngine&, timeT);
/**
* Move the insertion cursor to the tqlayout-X coordinate
* Move the insertion cursor to the layout-X coordinate
* corresponding to the given canvas coordinates, and show it.
*/
virtual void setInsertCursorPosition(double x, int y);
/**
* Returns the tqlayout-X coordinate corresponding to the current
* Returns the layout-X coordinate corresponding to the current
* position of the insertion cursor. Returns -1 if this staff
* is not current or there is some other problem.
*/
@ -454,8 +454,8 @@ public:
virtual void hideInsertCursor();
/**
* Query the given horizontal tqlayout object (which is assumed to
* have just completed its tqlayout procedure) to determine the
* Query the given horizontal layout object (which is assumed to
* have just completed its layout procedure) to determine the
* required extents of the staff and the positions of the bars,
* and create the bars and staff lines accordingly. It may be
* called either before or after renderElements and/or
@ -464,7 +464,7 @@ public:
* No bars or staff lines will appear unless this method has
* been called.
*/
virtual void sizeStaff(HorizontalLayoutEngine& tqlayout);
virtual void sizeStaff(HorizontalLayoutEngine& layout);
/**
* Generate or re-generate sprites for all the elements between
@ -486,9 +486,9 @@ public:
/**
* Assign suitable coordinates to the elements on the staff
* between the start and end times, based entirely on the tqlayout
* between the start and end times, based entirely on the layout
* X and Y coordinates they were given by the horizontal and
* vertical tqlayout processes.
* vertical layout processes.
*
* The implementation is free to render any elements it
* chooses in this method as well.
@ -519,7 +519,7 @@ public:
* Also return the clef and key in force at these coordinates.
*
* The default implementation should suit for subclasses that only
* show a single element per tqlayout X coordinate.
* show a single element per layout X coordinate.
*/
virtual ViewElementList::iterator getClosestElementToCanvasCoords
(double x, int y,
@ -533,7 +533,7 @@ public:
/**
* Return an iterator pointing to the nearest view element to the
* given tqlayout x-coordinate.
* given layout x-coordinate.
*
* If notesAndRestsOnly is true, do not return any view element
* other than a note or rest.
@ -564,7 +564,7 @@ public:
*
*
* The default implementation should suit for subclasses that only
* show a single element per tqlayout X coordinate.
* show a single element per layout X coordinate.
*/
virtual ViewElementList::iterator getElementUnderCanvasCoords
(double x, int y, Event *&clef, Event *&key) {
@ -627,10 +627,10 @@ public:
protected:
// Methods that the subclass may (indeed, should) use to convert
// between the tqlayout coordinates of elements and their canvas
// between the layout coordinates of elements and their canvas
// coordinates. These are deliberately not virtual.
// Note that even linear-tqlayout staffs have multiple rows; their
// Note that even linear-layout staffs have multiple rows; their
// rows all have the same y coordinate but increasing x
// coordinates, instead of the other way around. (The only reason
// for this is that it seems to be more efficient from the TQCanvas
@ -682,7 +682,7 @@ protected:
// signatures, override the deleteTimeSignatures and
// insertTimeSignature methods. For repeated clefs and keys at
// the start of each row, override deleteRepeatedClefsAndKeys
// and insertRepeatedClefAndKey, but note that your tqlayout class
// and insertRepeatedClefAndKey, but note that your layout class
// will need to allot the space for them separately.
virtual void resizeStaffLines();
@ -737,7 +737,7 @@ protected:
ItemMatrix m_staffLines;
ItemList m_staffConnectingLines;
typedef std::pair<double, TQCanvasItem *> LineRec; // tqlayout-x, line
typedef std::pair<double, TQCanvasItem *> LineRec; // layout-x, line
typedef FastVector<LineRec> LineRecList;
typedef FastVector<BarLine *> BarLineList;//!!! should be multiset I reckon
static bool compareBars(const BarLine *, const BarLine *);

18
src/gui/general/PresetHandlerDialog.cpp
Unescape View File

@ -81,7 +81,7 @@ PresetHandlerDialog::initDialog()
TQFrame *frame = new TQFrame(vBox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 6, 5, 10, 5);
TQGridLayout *layout = new TQGridLayout(frame, 6, 5, 10, 5);
TQLabel *title = new TQLabel(i18n("Select preset track parameters for:"), frame);
if (m_fromNotation) title->setText(i18n("Create appropriate notation for:"));
@ -114,14 +114,14 @@ PresetHandlerDialog::initDialog()
onlyNewSegments->setChecked(true);
}
tqlayout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
tqlayout->addWidget(catlabel, 1, 0, AlignRight);
tqlayout->addWidget(m_categoryCombo, 1, 1);
tqlayout->addWidget(inslabel, 2, 0, AlignRight);
tqlayout->addWidget(m_instrumentCombo, 2, 1);
tqlayout->addWidget(plylabel, 3, 0, AlignRight);
tqlayout->addWidget(m_playerCombo, 3, 1);
tqlayout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
layout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft);
layout->addWidget(catlabel, 1, 0, AlignRight);
layout->addWidget(m_categoryCombo, 1, 1);
layout->addWidget(inslabel, 2, 0, AlignRight);
layout->addWidget(m_instrumentCombo, 2, 1);
layout->addWidget(plylabel, 3, 0, AlignRight);
layout->addWidget(m_playerCombo, 3, 1);
layout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft);
populateCategoryCombo();
// try to set to same category used previously

16
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -514,8 +514,8 @@ hoverSect( TQTC_NO_SECT ) {
shadeColors( tqApp->tqpalette().active().highlight(), menuPbar );
else
shadeGradient( tqApp->tqpalette().active().highlight(), menuPbar );
shadeColors( tqApp->tqpalette().active().background(), gray );
shadeColors( tqApp->tqpalette().active().button(), button );
shadeColors( tqApp->palette().active().background(), gray );
shadeColors( tqApp->palette().active().button(), button );
}
void KlearlookStyle::polish( TQApplication *app ) {
@ -549,11 +549,11 @@ void KlearlookStyle::polish( TQPalette &pal ) {
newContrast = true;
}
if ( newContrast || gray[ NUM_SHADES ] != tqApp->tqpalette().active().background() )
shadeColors( tqApp->tqpalette().active().background(), gray );
if ( newContrast || gray[ NUM_SHADES ] != tqApp->palette().active().background() )
shadeColors( tqApp->palette().active().background(), gray );
if ( newContrast || button[ NUM_SHADES ] != tqApp->tqpalette().active().button() )
shadeColors( tqApp->tqpalette().active().button(), button );
if ( newContrast || button[ NUM_SHADES ] != tqApp->palette().active().button() )
shadeColors( tqApp->palette().active().button(), button );
if ( PROFILE_RAISED == pmProfile ) {
if ( newContrast || menuPbar[ NUM_SHADES ] != tqApp->tqpalette().active().highlight() )
@ -1475,7 +1475,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
int x = r.x(), y = r.y(), w = r.width(), h = r.height(), marg = lv->itemMargin();
p->setPen( TQPen( flags & Style_Enabled ? cg.text()
: lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
: lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ) ) );
if ( flags & Style_Selected && !lv->rootIsDecorated() &&
!( ( item->parent() && 1 == item->parent() ->rtti() &&
@ -1500,7 +1500,7 @@ void KlearlookStyle::tqdrawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, cons
TQListView * lv = item->listView();
p->setPen( TQPen( flags & Style_Enabled ? cg.text()
: lv->tqpalette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
: lv->palette().color( TQPalette::Disabled, TQColorGroup::Text ), 2 ) );
if ( flags & Style_Selected ) {
flags -= Style_Selected;
if ( !lv->rootIsDecorated() &&

2
src/gui/studio/AudioMixerWindow.cpp
Unescape View File

@ -1714,7 +1714,7 @@ AudioMixerWindow::slotToggleUnassignedFaders()
void
AudioMixerWindow::toggleNamedWidgets(bool show, const char* const name)
{
TQLayoutIterator it = m_mainBox->tqlayout()->iterator();
TQLayoutIterator it = m_mainBox->layout()->iterator();
TQLayoutItem *child;
while ( (child = it.current()) != 0 ) {
TQWidget * widget = child->widget();

14
src/gui/studio/BankEditorDialog.cpp
Unescape View File

@ -102,18 +102,18 @@ BankEditorDialog::BankEditorDialog(TQWidget *parent,
btnBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
m_closeButton = new TQPushButton(btnBox);
m_applyButton = new TQPushButton(i18n("Apply"), btnBox);
m_resetButton = new TQPushButton(i18n("Reset"), btnBox);
tqlayout->addStretch(10);
tqlayout->addWidget(m_applyButton);
tqlayout->addWidget(m_resetButton);
tqlayout->addSpacing(15);
tqlayout->addWidget(m_closeButton);
tqlayout->addSpacing(5);
layout->addStretch(10);
layout->addWidget(m_applyButton);
layout->addWidget(m_resetButton);
layout->addSpacing(15);
layout->addWidget(m_closeButton);
layout->addSpacing(5);
connect(m_applyButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotApply()));

20
src/gui/studio/DeviceManagerDialog.cpp
Unescape View File

@ -110,7 +110,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
m_playTable->setSelectionMode(TQTable::SingleRow);
TQFrame *frame = new TQFrame(groupBox);
TQVBoxLayout *vtqlayout = new TQVBoxLayout(frame);
TQVBoxLayout *vlayout = new TQVBoxLayout(frame);
TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame);
TQPushButton *addButton = new TQPushButton(i18n("New"), buttons);
m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons);
@ -118,8 +118,8 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
m_exportButton = new TQPushButton(i18n("Export..."), buttons);
m_banksButton = new TQPushButton(i18n("Banks..."), buttons);
m_controllersButton = new TQPushButton(i18n("Control Events..."), buttons);
vtqlayout->addWidget(buttons);
vtqlayout->addStretch(10);
vlayout->addWidget(buttons);
vlayout->addStretch(10);
TQToolTip::add
(addButton,
@ -169,12 +169,12 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
m_recordTable->setSelectionMode(TQTable::SingleRow);
frame = new TQFrame(groupBox);
vtqlayout = new TQVBoxLayout(frame);
vlayout = new TQVBoxLayout(frame);
buttons = new TQGrid(2, Qt::Horizontal, frame);
addButton = new TQPushButton(i18n("New"), buttons);
m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons);
vtqlayout->addWidget(buttons);
vtqlayout->addStretch(10);
vlayout->addWidget(buttons);
vlayout->addStretch(10);
TQToolTip::add
(addButton,
@ -209,10 +209,10 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
tqlayout->addStretch(10);
tqlayout->addWidget(closeButton);
tqlayout->addSpacing(5);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
layout->addStretch(10);
layout->addWidget(closeButton);
layout->addSpacing(5);
KAction* close = KStdAction::close(TQT_TQOBJECT(this),
TQT_SLOT(slotClose()),

8
src/gui/studio/SynthPluginManagerDialog.cpp
Unescape View File

@ -166,10 +166,10 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent,
TQPushButton *closeButton = new TQPushButton(i18n("Close"), btnBox);
TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 0, 10);
tqlayout->addStretch(10);
tqlayout->addWidget(closeButton);
tqlayout->addSpacing(5);
TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 0, 10);
layout->addStretch(10);
layout->addWidget(closeButton);
layout->addSpacing(5);
KAction* close = KStdAction::close(TQT_TQOBJECT(this),
TQT_SLOT(slotClose()),

8
src/gui/widgets/CollapsingFrame.cpp
Unescape View File

@ -47,7 +47,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
m_fill(false),
m_collapsed(false)
{
m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
m_layout = new TQGridLayout(this, 3, 3, 0, 0);
m_toggleButton = new TQToolButton(this);
m_toggleButton->setTextLabel(label);
@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
}
CollapsingFrame::~CollapsingFrame()
@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
assert(!m_widget);
m_widget = widget;
if (m_fill) {
m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
} else {
m_tqlayout->addWidget(widget, 1, 1);
m_layout->addWidget(widget, 1, 1);
}
bool expanded = true;

2
src/gui/widgets/CollapsingFrame.h
Unescape View File

@ -62,7 +62,7 @@ public slots:
void toggle();
protected:
TQGridLayout *m_tqlayout;
TQGridLayout *m_layout;
TQToolButton *m_toggleButton;
TQWidget *m_widget;
bool m_fill;

12
src/gui/widgets/PluginControl.cpp
Unescape View File

@ -44,7 +44,7 @@ namespace Rosegarden
{
PluginControl::PluginControl(TQWidget *parent,
TQGridLayout *tqlayout,
TQGridLayout *layout,
ControlType type,
PluginPort *port,
AudioPluginManager *aPM,
@ -53,7 +53,7 @@ PluginControl::PluginControl(TQWidget *parent,
bool showBounds,
bool hidden):
TQObject(parent),
m_tqlayout(tqlayout),
m_layout(layout),
m_type(type),
m_port(port),
m_pluginManager(aPM),
@ -166,7 +166,7 @@ PluginControl::PluginControl(TQWidget *parent,
controlTitle->show();
item = new TQWidgetItem(controlTitle);
item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
m_tqlayout->addItem(item);
m_layout->addItem(item);
} else {
controlTitle->hide();
}
@ -175,7 +175,7 @@ PluginControl::PluginControl(TQWidget *parent,
low->show();
item = new TQWidgetItem(low);
item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
m_tqlayout->addItem(item);
m_layout->addItem(item);
} else {
low->hide();
}
@ -184,7 +184,7 @@ PluginControl::PluginControl(TQWidget *parent,
m_dial->show();
item = new TQWidgetItem(m_dial);
item->setAlignment(TQt::AlignCenter);
m_tqlayout->addItem(item);
m_layout->addItem(item);
} else {
m_dial->hide();
}
@ -193,7 +193,7 @@ PluginControl::PluginControl(TQWidget *parent,
upp->show();
item = new TQWidgetItem(upp);
item->setAlignment(TQt::AlignLeft | TQt::AlignBottom);
m_tqlayout->addItem(item);
m_layout->addItem(item);
} else {
upp->hide();
}

4
src/gui/widgets/PluginControl.h
Unescape View File

@ -57,7 +57,7 @@ public:
} ControlType;
PluginControl(TQWidget *parent,
TQGridLayout *tqlayout,
TQGridLayout *layout,
ControlType type,
PluginPort *port,
AudioPluginManager *pluginManager,
@ -84,7 +84,7 @@ protected:
//--------------- Data members ---------------------------------
TQGridLayout *m_tqlayout;
TQGridLayout *m_layout;
ControlType m_type;
PluginPort *m_port;

50
src/gui/widgets/QuantizeParameters.cpp
Unescape View File

@ -82,18 +82,18 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_mainLayout->addWidget(quantizerBox, zero, 0);
TQFrame *typeFrame = new TQFrame(quantizerBox);
TQGridLayout *tqlayout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
tqlayout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
TQGridLayout *layout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
layout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
m_typeCombo = new KComboBox(typeFrame);
m_typeCombo->insertItem(i18n("Grid quantizer"));
m_typeCombo->insertItem(i18n("Legato quantizer"));
m_typeCombo->insertItem(i18n("Heuristic notation quantizer"));
tqlayout->addWidget(m_typeCombo, 0, 1);
layout->addWidget(m_typeCombo, 0, 1);
m_notationTarget = new TQCheckBox
(i18n("Quantize for notation only (leave performance unchanged)"),
typeFrame);
tqlayout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
layout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
if (!showNotationOption)
m_notationTarget->hide();
@ -104,14 +104,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
(1, Qt::Horizontal, i18n("Notation parameters"), parameterBox);
TQFrame *notationFrame = new TQFrame(m_notationBox);
tqlayout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
layout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
layout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
1, 0);
m_notationUnitCombo = new KComboBox(notationFrame);
tqlayout->addWidget(m_notationUnitCombo, 1, 1);
layout->addWidget(m_notationUnitCombo, 1, 1);
tqlayout->addWidget(new TQLabel(i18n("Complexity:"),
layout->addWidget(new TQLabel(i18n("Complexity:"),
notationFrame), 0, 0);
m_simplicityCombo = new KComboBox(notationFrame);
@ -120,9 +120,9 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_simplicityCombo->insertItem(i18n("Normal"));
m_simplicityCombo->insertItem(i18n("Low"));
m_simplicityCombo->insertItem(i18n("Very low"));
tqlayout->addWidget(m_simplicityCombo, 0, 1);
layout->addWidget(m_simplicityCombo, 0, 1);
tqlayout->addWidget(new TQLabel(i18n("Tuplet level:"),
layout->addWidget(new TQLabel(i18n("Tuplet level:"),
notationFrame), 2, 0);
m_maxTuplet = new KComboBox(notationFrame);
m_maxTuplet->insertItem(i18n("None"));
@ -136,34 +136,34 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_maxTuplet->insertItem(i18n("8-Tuplet"));
*/
m_maxTuplet->insertItem(i18n("Any"));
tqlayout->addWidget(m_maxTuplet, 2, 1);
layout->addWidget(m_maxTuplet, 2, 1);
m_counterpoint = new TQCheckBox(i18n("Permit counterpoint"), notationFrame);
tqlayout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
layout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
m_gridBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Grid parameters"), parameterBox);
TQFrame *gridFrame = new TQFrame(m_gridBox);
tqlayout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
layout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
layout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
m_gridUnitCombo = new KComboBox(gridFrame);
tqlayout->addWidget(m_gridUnitCombo, 0, 1);
layout->addWidget(m_gridUnitCombo, 0, 1);
m_swingLabel = new TQLabel(i18n("Swing:"), gridFrame);
tqlayout->addWidget(m_swingLabel, 1, 0);
layout->addWidget(m_swingLabel, 1, 0);
m_swingCombo = new KComboBox(gridFrame);
tqlayout->addWidget(m_swingCombo, 1, 1);
layout->addWidget(m_swingCombo, 1, 1);
m_iterativeLabel = new TQLabel(i18n("Iterative amount:"), gridFrame);
tqlayout->addWidget(m_iterativeLabel, 2, 0);
layout->addWidget(m_iterativeLabel, 2, 0);
m_iterativeCombo = new KComboBox(gridFrame);
tqlayout->addWidget(m_iterativeCombo, 2, 1);
layout->addWidget(m_iterativeCombo, 2, 1);
m_durationCheckBox = new TQCheckBox
(i18n("Quantize durations as well as start times"), gridFrame);
tqlayout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
layout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
m_postProcessingBox = new TQGroupBox
(1, Qt::Horizontal, i18n("After quantization"), this);
@ -188,17 +188,17 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
TQFrame *postFrame = new TQFrame(m_postProcessingBox);
tqlayout = new TQGridLayout(postFrame, 4, 1, 5, 3);
layout = new TQGridLayout(postFrame, 4, 1, 5, 3);
m_rebeam = new TQCheckBox(i18n("Re-beam"), postFrame);
m_articulate = new TQCheckBox
(i18n("Add articulations (staccato, tenuto, slurs)"), postFrame);
m_makeViable = new TQCheckBox(i18n("Tie notes at barlines etc"), postFrame);
m_deCounterpoint = new TQCheckBox(i18n("Split-and-tie overlapping chords"), postFrame);
tqlayout->addWidget(m_rebeam, 0, 0);
tqlayout->addWidget(m_articulate, 1, 0);
tqlayout->addWidget(m_makeViable, 2, 0);
tqlayout->addWidget(m_deCounterpoint, 3, 0);
layout->addWidget(m_rebeam, 0, 0);
layout->addWidget(m_articulate, 1, 0);
layout->addWidget(m_makeViable, 2, 0);
layout->addWidget(m_deCounterpoint, 3, 0);
TQPixmap noMap = NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("menu-no-note"));

56
src/gui/widgets/TimeWidget.cpp
Unescape View File

@ -93,14 +93,14 @@ TimeWidget::init(bool editable)
editable = true;
TQFrame *frame = new TQFrame(this);
TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
TQLabel *label = 0;
if (m_isDuration) {
label = new TQLabel(i18n("Note:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 0, 0);
layout->addWidget(label, 0, 0);
if (editable) {
m_note = new TQComboBox(frame);
@ -133,7 +133,7 @@ TimeWidget::init(bool editable)
}
connect(m_note, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotNoteChanged(int)));
tqlayout->addMultiCellWidget(m_note, 0, 0, 1, 3);
layout->addMultiCellWidget(m_note, 0, 0, 1, 3);
} else {
@ -145,12 +145,12 @@ TimeWidget::init(bool editable)
label = i18n("<inexact>");
TQLineEdit *le = new TQLineEdit(label, frame);
le->setReadOnly(true);
tqlayout->addMultiCellWidget(le, 0, 0, 1, 3);
layout->addMultiCellWidget(le, 0, 0, 1, 3);
}
label = new TQLabel(i18n("Units:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 0, 4);
layout->addWidget(label, 0, 4);
if (editable) {
m_timeT = new TQSpinBox(frame);
@ -158,12 +158,12 @@ TimeWidget::init(bool editable)
(Note(Note::Shortest).getDuration());
connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotTimeTChanged(int)));
tqlayout->addWidget(m_timeT, 0, 5);
layout->addWidget(m_timeT, 0, 5);
} else {
m_timeT = 0;
TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
le->setReadOnly(true);
tqlayout->addWidget(le, 0, 5);
layout->addWidget(le, 0, 5);
}
} else {
@ -172,7 +172,7 @@ TimeWidget::init(bool editable)
label = new TQLabel(i18n("Time:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 0, 0);
layout->addWidget(label, 0, 0);
if (editable) {
m_timeT = new TQSpinBox(frame);
@ -180,19 +180,19 @@ TimeWidget::init(bool editable)
(Note(Note::Shortest).getDuration());
connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotTimeTChanged(int)));
tqlayout->addWidget(m_timeT, 0, 1);
tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
layout->addWidget(m_timeT, 0, 1);
layout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
} else {
m_timeT = 0;
TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
le->setReadOnly(true);
tqlayout->addWidget(le, 0, 2);
layout->addWidget(le, 0, 2);
}
}
label = new TQLabel(m_isDuration ? i18n("Measures:") : i18n("Measure:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 1, 0);
layout->addWidget(label, 1, 0);
if (editable) {
m_barLabel = 0;
@ -201,17 +201,17 @@ TimeWidget::init(bool editable)
m_bar->setMinValue(0);
connect(m_bar, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
tqlayout->addWidget(m_bar, 1, 1);
layout->addWidget(m_bar, 1, 1);
} else {
m_bar = 0;
m_barLabel = new TQLineEdit(frame);
m_barLabel->setReadOnly(true);
tqlayout->addWidget(m_barLabel, 1, 1);
layout->addWidget(m_barLabel, 1, 1);
}
label = new TQLabel(m_isDuration ? i18n("beats:") : i18n("beat:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 1, 2);
layout->addWidget(label, 1, 2);
if (editable) {
m_beatLabel = 0;
@ -219,12 +219,12 @@ TimeWidget::init(bool editable)
m_beat->setMinValue(1);
connect(m_beat, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
tqlayout->addWidget(m_beat, 1, 3);
layout->addWidget(m_beat, 1, 3);
} else {
m_beat = 0;
m_beatLabel = new TQLineEdit(frame);
m_beatLabel->setReadOnly(true);
tqlayout->addWidget(m_beatLabel, 1, 3);
layout->addWidget(m_beatLabel, 1, 3);
}
label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName
@ -232,7 +232,7 @@ TimeWidget::init(bool editable)
(Note::Shortest), true)),
frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 1, 4);
layout->addWidget(label, 1, 4);
if (editable) {
m_fractionLabel = 0;
@ -240,20 +240,20 @@ TimeWidget::init(bool editable)
m_fraction->setMinValue(1);
connect(m_fraction, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
tqlayout->addWidget(m_fraction, 1, 5);
layout->addWidget(m_fraction, 1, 5);
} else {
m_fraction = 0;
m_fractionLabel = new TQLineEdit(frame);
m_fractionLabel->setReadOnly(true);
tqlayout->addWidget(m_fractionLabel, 1, 5);
layout->addWidget(m_fractionLabel, 1, 5);
}
m_timeSig = new TQLabel(frame);
tqlayout->addWidget(m_timeSig, 1, 6);
layout->addWidget(m_timeSig, 1, 6);
label = new TQLabel(i18n("Seconds:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 2, 0);
layout->addWidget(label, 2, 0);
if (editable) {
m_secLabel = 0;
@ -262,17 +262,17 @@ TimeWidget::init(bool editable)
m_sec->setMinValue(0);
connect(m_sec, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotSecOrMSecChanged(int)));
tqlayout->addWidget(m_sec, 2, 1);
layout->addWidget(m_sec, 2, 1);
} else {
m_sec = 0;
m_secLabel = new TQLineEdit(frame);
m_secLabel->setReadOnly(true);
tqlayout->addWidget(m_secLabel, 2, 1);
layout->addWidget(m_secLabel, 2, 1);
}
label = new TQLabel(i18n("msec:"), frame);
label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
tqlayout->addWidget(label, 2, 2);
layout->addWidget(label, 2, 2);
if (editable) {
m_msecLabel = 0;
@ -281,17 +281,17 @@ TimeWidget::init(bool editable)
m_msec->setLineStep(10);
connect(m_msec, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotSecOrMSecChanged(int)));
tqlayout->addWidget(m_msec, 2, 3);
layout->addWidget(m_msec, 2, 3);
} else {
m_msec = 0;
m_msecLabel = new TQLineEdit(frame);
m_msecLabel->setReadOnly(true);
tqlayout->addWidget(m_msecLabel, 2, 3);
layout->addWidget(m_msecLabel, 2, 3);
}
if (m_isDuration) {
m_tempo = new TQLabel(frame);
tqlayout->addWidget(m_tempo, 2, 6);
layout->addWidget(m_tempo, 2, 6);
} else {
m_tempo = 0;
}

Write Preview
Loading…
Cancel
Save