summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NotationView.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/notation/NotationView.cpp')
-rw-r--r--src/gui/editors/notation/NotationView.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index d58515f..64b49ec 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -571,15 +571,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_staffs[0]->setCurrent(true);
m_config->setGroup(NotationViewConfigGroup);
- int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
+ int layoutMode = m_config->readNumEntry("layoutmode", 0);
try
{
LinedStaff::PageMode mode = LinedStaff::LinearMode;
- if (tqlayoutMode == 1)
+ if (layoutMode == 1)
mode = LinedStaff::ContinuousPageMode;
- else if (tqlayoutMode == 2)
+ else if (layoutMode == 2)
mode = LinedStaff::MultiPageMode;
setPageMode(mode);
@@ -1458,7 +1458,7 @@ void NotationView::readOptions()
setOneToolbar("show_clefs_toolbar", "Clefs Toolbar");
setOneToolbar("show_group_toolbar", "Group Toolbar");
setOneToolbar("show_marks_toolbar", "Marks Toolbar");
- setOneToolbar("show_tqlayout_toolbar", "Layout Toolbar");
+ setOneToolbar("show_layout_toolbar", "Layout Toolbar");
setOneToolbar("show_transport_toolbar", "Transport Toolbar");
setOneToolbar("show_accidentals_toolbar", "Accidentals Toolbar");
setOneToolbar("show_meta_toolbar", "Meta Toolbar");
@@ -1816,7 +1816,7 @@ void NotationView::setupActions()
//
// Settings menu
//
- int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
+ int layoutMode = m_config->readNumEntry("layoutmode", 0);
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
@@ -1825,8 +1825,8 @@ void NotationView::setupActions()
KRadioAction *linearModeAction = new KRadioAction
(i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
- linearModeAction->setExclusiveGroup("tqlayoutMode");
- if (tqlayoutMode == 0)
+ linearModeAction->setExclusiveGroup("layoutMode");
+ if (layoutMode == 0)
linearModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
@@ -1834,8 +1834,8 @@ void NotationView::setupActions()
KRadioAction *continuousPageModeAction = new KRadioAction
(i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
- continuousPageModeAction->setExclusiveGroup("tqlayoutMode");
- if (tqlayoutMode == 1)
+ continuousPageModeAction->setExclusiveGroup("layoutMode");
+ if (layoutMode == 1)
continuousPageModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
@@ -1843,8 +1843,8 @@ void NotationView::setupActions()
KRadioAction *multiPageModeAction = new KRadioAction
(i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
- multiPageModeAction->setExclusiveGroup("tqlayoutMode");
- if (tqlayoutMode == 2)
+ multiPageModeAction->setExclusiveGroup("layoutMode");
+ if (layoutMode == 2)
multiPageModeAction->setChecked(true);
new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this),
@@ -2304,7 +2304,7 @@ void NotationView::setupActions()
"palette-marks" },
{ i18n("Show &Group Toolbar"), "1slotToggleGroupToolBar()", "show_group_toolbar",
"palette-group" },
- { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_tqlayout_toolbar",
+ { i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_layout_toolbar",
"palette-font" },
{ i18n("Show Trans&port Toolbar"), "1slotToggleTransportToolBar()", "show_transport_toolbar",
"palette-transport" },
@@ -2607,21 +2607,21 @@ bool NotationView::isCurrentStaff(int i)
void NotationView::initLayoutToolbar()
{
- KToolBar *tqlayoutToolbar = toolBar("Layout Toolbar");
+ KToolBar *layoutToolbar = toolBar("Layout Toolbar");
- if (!tqlayoutToolbar) {
+ if (!layoutToolbar) {
std::cerr
<< "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
<< std::endl;
return ;
}
- new TQLabel(i18n(" Font: "), tqlayoutToolbar, "font label");
+ new TQLabel(i18n(" Font: "), layoutToolbar, "font label");
//
// font combo
//
- m_fontCombo = new KComboBox(tqlayoutToolbar);
+ m_fontCombo = new KComboBox(layoutToolbar);
m_fontCombo->setEditable(false);
std::set
@@ -2652,7 +2652,7 @@ void NotationView::initLayoutToolbar()
connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)),
this, TQT_SLOT(slotChangeFont(const TQString &)));
- new TQLabel(i18n(" Size: "), tqlayoutToolbar, "size label");
+ new TQLabel(i18n(" Size: "), layoutToolbar, "size label");
TQString value;
@@ -2660,7 +2660,7 @@ void NotationView::initLayoutToolbar()
// font size combo
//
std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName);
- m_fontSizeCombo = new KComboBox(tqlayoutToolbar, "font size combo");
+ m_fontSizeCombo = new KComboBox(layoutToolbar, "font size combo");
for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
@@ -2674,7 +2674,7 @@ void NotationView::initLayoutToolbar()
connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
- new TQLabel(i18n(" Spacing: "), tqlayoutToolbar, "spacing label");
+ new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label");
//
// spacing combo
@@ -2682,7 +2682,7 @@ void NotationView::initLayoutToolbar()
int defaultSpacing = m_htqlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
- m_spacingCombo = new KComboBox(tqlayoutToolbar, "spacing combo");
+ m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) {
value.setNum(*i);
@@ -2794,8 +2794,8 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
positionStaffs();
- bool tqlayoutApplied = applyLayout();
- if (!tqlayoutApplied)
+ bool layoutApplied = applyLayout();
+ if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -3329,12 +3329,12 @@ void NotationView::playNote(Segment &s, int pitch, int velocity)
StudioControl::sendMappedEvent(mE);
}
-void NotationView::showPreviewNote(int staffNo, double tqlayoutX,
+void NotationView::showPreviewNote(int staffNo, double layoutX,
int pitch, int height,
const Note &note, bool grace,
int velocity)
{
- m_staffs[staffNo]->showPreviewNote(tqlayoutX, height, note, grace);
+ m_staffs[staffNo]->showPreviewNote(layoutX, height, note, grace);
playNote(m_staffs[staffNo]->getSegment(), pitch, velocity);
}
@@ -3446,10 +3446,10 @@ NotationView::getInsertionTime(Clef &clef,
// the segment but the staff has a more efficient lookup
LinedStaff *staff = m_staffs[m_currentStaff];
- double tqlayoutX = staff->getLayoutXOfInsertCursor();
- if (tqlayoutX < 0) tqlayoutX = 0;
+ double layoutX = staff->getLayoutXOfInsertCursor();
+ if (layoutX < 0) layoutX = 0;
Event *clefEvt = 0, *keyEvt = 0;
- (void)staff->getElementUnderLayoutX(tqlayoutX, clefEvt, keyEvt);
+ (void)staff->getElementUnderLayoutX(layoutX, clefEvt, keyEvt);
if (clefEvt) clef = Clef(*clefEvt);
else clef = Clef();
@@ -3599,7 +3599,7 @@ void NotationView::print(bool previewOnly)
// Supplying doublebuffer==true to this method appears to
// slow down printing considerably but without it we get
// all sorts of horrible artifacts (possibly related to
- // mishandling of pixmap tqmasks?) in qt-3.0. Let's permit
+ // mishandling of pixmap masks?) in qt-3.0. Let's permit
// it as a "hidden" option.
m_config->setGroup(NotationViewConfigGroup);
@@ -4592,8 +4592,8 @@ NotationView::slotChangeFont(std::string newName, int newSize)
positionStaffs();
- bool tqlayoutApplied = applyLayout();
- if (!tqlayoutApplied)
+ bool layoutApplied = applyLayout();
+ if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@@ -6438,7 +6438,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
- double tqlayoutX = m_htqlayout->getXForTimeByEvent(time);
+ double layoutX = m_htqlayout->getXForTimeByEvent(time);
Segment &seg = m_staffs[i]->getSegment();
bool good = true;
@@ -6449,7 +6449,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
seg.getStartTime() +
((time - seg.getStartTime()) %
(seg.getEndMarkerTime() - seg.getStartTime()));
- tqlayoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
+ layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
} else {
good = false;
}
@@ -6463,7 +6463,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
} else {
- m_staffs[i]->setPointerPosition(tqlayoutX);
+ m_staffs[i]->setPointerPosition(layoutX);
int cy;
m_staffs[i]->getPointerPosition(cx, cy);
@@ -7115,8 +7115,8 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
} else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
- double tqlayoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
- emit editTimeSignature(m_htqlayout->getTimeForX(tqlayoutX));
+ double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
+ emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 08:05:32 +0000