summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r--muse2/muse/widgets/comboQuant.cpp6
-rw-r--r--muse2/muse/widgets/filedialog.cpp23
-rw-r--r--muse2/muse/widgets/filedialog.h14
-rw-r--r--muse2/muse/widgets/metronome.cpp2
-rw-r--r--muse2/muse/widgets/mtscale_flo.cpp3
-rw-r--r--muse2/muse/widgets/routepopup.cpp12
-rw-r--r--muse2/muse/widgets/shortcutcapturedialog.cpp4
-rw-r--r--muse2/muse/widgets/shortcutconfig.cpp6
-rw-r--r--muse2/muse/widgets/shortcutconfigbase.ui115
-rw-r--r--muse2/muse/widgets/tb1.cpp7
-rw-r--r--muse2/muse/widgets/tools.cpp46
-rw-r--r--muse2/muse/widgets/visibletracks.cpp30
12 files changed, 132 insertions, 136 deletions
diff --git a/muse2/muse/widgets/comboQuant.cpp b/muse2/muse/widgets/comboQuant.cpp
index aee7ad5c..6d8dc30c 100644
--- a/muse2/muse/widgets/comboQuant.cpp
+++ b/muse2/muse/widgets/comboQuant.cpp
@@ -37,9 +37,9 @@ static int quantTable[] = {
};
static const char* quantStrings[] = {
- QT_TRANSLATE_NOOP("@default", "Off"), "64T", "32T", "16T", "8T", "4T", "2T", "1T",
- QT_TRANSLATE_NOOP("@default", "Off"), "64", "32", "16", "8", "4", "2", "1",
- QT_TRANSLATE_NOOP("@default", "Off"), "64.", "32.", "16.", "8.", "4.", "2.", "1."
+ QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64T", "32T", "16T", "8T", "4T", "2T", "1T",
+ QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64", "32", "16", "8", "4", "2", "1",
+ QT_TRANSLATE_NOOP("MusEGui::ComboQuant", "Off"), "64.", "32.", "16.", "8.", "4.", "2.", "1."
};
//---------------------------------------------------------
diff --git a/muse2/muse/widgets/filedialog.cpp b/muse2/muse/widgets/filedialog.cpp
index df391b45..68f2718f 100644
--- a/muse2/muse/widgets/filedialog.cpp
+++ b/muse2/muse/widgets/filedialog.cpp
@@ -33,6 +33,7 @@
#include "filedialog.h"
#include "../globals.h"
#include "gconfig.h"
+#include "helper.h"
namespace MusEGui {
@@ -300,9 +301,11 @@ QString getFilterExtension(const QString &filter)
//---------------------------------------------------------
// getOpenFileName
//---------------------------------------------------------
-QString getOpenFileName(const QString &startWith,
- const QStringList& filters, QWidget* parent, const QString& name, bool* all, MFileDialog::ViewType viewType)
+QString getOpenFileName(const QString &startWith, const char** filters_chararray,
+ QWidget* parent, const QString& name, bool* all, MFileDialog::ViewType viewType)
{
+ QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
+
QString initialSelection; // FIXME Tim.
MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, false);
dlg->setNameFilters(filters);
@@ -339,9 +342,10 @@ QString getOpenFileName(const QString &startWith,
//---------------------------------------------------------
QString getSaveFileName(const QString &startWith,
- //const char** filters, QWidget* parent, const QString& name)
- const QStringList& filters, QWidget* parent, const QString& name)
+ const char** filters_chararray, QWidget* parent, const QString& name)
{
+ QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
+
MFileDialog *dlg = new MFileDialog(startWith, QString::null, parent, true);
dlg->setNameFilters(filters);
dlg->setWindowTitle(name);
@@ -404,9 +408,9 @@ QString getSaveFileName(const QString &startWith,
//---------------------------------------------------------
QString getImageFileName(const QString& startWith,
- //const char** filters, QWidget* parent, const QString& name)
- const QStringList& filters, QWidget* parent, const QString& name)
+ const char** filters_chararray, QWidget* parent, const QString& name)
{
+ QStringList filters = localizedStringListFromCharArray(filters_chararray, "file_patterns");
QString initialSelection;
QString* workingDirectory = new QString(QDir::currentPath());
if (!startWith.isEmpty() ) {
@@ -547,15 +551,14 @@ MFile::~MFile()
// open
//---------------------------------------------------------
-//FILE* MFile::open(const char* mode, const char** pattern,
-FILE* MFile::open(const char* mode, const QStringList& pattern,
+FILE* MFile::open(const char* mode, const char** patterns_chararray,
QWidget* parent, bool noError, bool warnIfOverwrite, const QString& caption)
{
QString name;
if (strcmp(mode, "r") == 0)
- name = getOpenFileName(path, pattern, parent, caption, 0);
+ name = getOpenFileName(path, patterns_chararray, parent, caption, 0);
else
- name = getSaveFileName(path, pattern, parent, caption);
+ name = getSaveFileName(path, patterns_chararray, parent, caption);
if (name.isEmpty())
return 0;
f = fileOpen(parent, name, ext, mode, isPopen, noError,
diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h
index e5687494..b731b65a 100644
--- a/muse2/muse/widgets/filedialog.h
+++ b/muse2/muse/widgets/filedialog.h
@@ -24,8 +24,6 @@
#include "ui_fdialogbuttons.h"
-class QStringList;
-
namespace MusEGui {
//---------------------------------------------------------
@@ -91,14 +89,11 @@ class ContentsPreview : public QWidget, public Q3FilePreview {
};
*/
-//QString getSaveFileName(const QString& startWidth, const char** filter,
-QString getSaveFileName(const QString& startWidth, const QStringList& filters,
+QString getSaveFileName(const QString& startWidth, const char** filters,
QWidget* parent, const QString& name);
-//QString getOpenFileName(const QString& startWidth, const char** filter,
-QString getOpenFileName(const QString& startWidth, const QStringList& filters,
+QString getOpenFileName(const QString& startWidth, const char** filters,
QWidget* parent, const QString& name, bool* openAll, MFileDialog::ViewType viewType = MFileDialog::PROJECT_VIEW);
-//QString getImageFileName(const QString& startWith, const char** filters,
-QString getImageFileName(const QString& startWith, const QStringList& filters,
+QString getImageFileName(const QString& startWith, const char** filters,
QWidget* parent, const QString& name);
FILE* fileOpen(QWidget*, QString, const QString&,
@@ -119,8 +114,7 @@ class MFile {
public:
MFile(const QString& path, const QString& ext);
~MFile();
- //FILE* open(const char* mode, const char** pattern,
- FILE* open(const char* mode, const QStringList& pattern,
+ FILE* open(const char* mode, const char** patterns,
QWidget* parent, bool noError,
bool warnIfOverwrite, const QString& caption);
};
diff --git a/muse2/muse/widgets/metronome.cpp b/muse2/muse/widgets/metronome.cpp
index e6b7bd91..416e9e47 100644
--- a/muse2/muse/widgets/metronome.cpp
+++ b/muse2/muse/widgets/metronome.cpp
@@ -85,7 +85,7 @@ void MetronomeConfig::audioBeepRoutesClicked()
int nn = 0;
for(MusECore::iAudioOutput iao = ol->begin(); iao != ol->end(); ++iao)
{
- QAction* action = pup->addAction(QT_TRANSLATE_NOOP("@default", (*iao)->name()));
+ QAction* action = pup->addAction((*iao)->name());
action->setCheckable(true);
action->setData(nn);
if((*iao)->sendMetronome())
diff --git a/muse2/muse/widgets/mtscale_flo.cpp b/muse2/muse/widgets/mtscale_flo.cpp
index df077102..c54ef1ad 100644
--- a/muse2/muse/widgets/mtscale_flo.cpp
+++ b/muse2/muse/widgets/mtscale_flo.cpp
@@ -45,6 +45,9 @@ MTScaleFlo::MTScaleFlo(ScoreCanvas* parent_editor, QWidget* parent_widget)
pos[0] = MusEGlobal::song->cpos();
pos[1] = MusEGlobal::song->lpos();
pos[2] = MusEGlobal::song->rpos();
+ xpos=0;
+ xoffset=0;
+
button = Qt::NoButton;
setMouseTracking(true);
connect(MusEGlobal::song, SIGNAL(posChanged(int, unsigned, bool)), SLOT(setPos(int, unsigned, bool)));
diff --git a/muse2/muse/widgets/routepopup.cpp b/muse2/muse/widgets/routepopup.cpp
index 73d29c25..80ae98bd 100644
--- a/muse2/muse/widgets/routepopup.cpp
+++ b/muse2/muse/widgets/routepopup.cpp
@@ -220,9 +220,9 @@ int RoutePopupMenu::addSyntiPorts(MusECore::AudioTrack* t, PopupMenu* lb, int id
{
char buffer[128];
if(tchans == 2)
- snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+ snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
else
- snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+ snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
act = chpup->addAction(QString(buffer));
act->setCheckable(true);
@@ -347,7 +347,7 @@ int RoutePopupMenu::addMultiChannelPorts(MusECore::AudioTrack* t, PopupMenu* pup
if(chans > 1)
{
char buffer[128];
- snprintf(buffer, 128, "%s %d", pup->tr("Channel").toLatin1().constData(), ch+1);
+ snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
chpup->setTitle(QString(buffer));
pup->addMenu(chpup);
}
@@ -425,7 +425,7 @@ int RoutePopupMenu::addMultiChannelPorts(MusECore::AudioTrack* t, PopupMenu* pup
if(chans > 2)
{
char buffer[128];
- snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+ snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
chpup->setTitle(QString(buffer));
pup->addMenu(chpup);
}
@@ -482,7 +482,7 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
for(int ch = 0; ch < chans; ++ch)
{
char buffer[128];
- snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1);
+ snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), ch+1);
act = chpup->addAction(QString(buffer));
act->setCheckable(true);
@@ -535,7 +535,7 @@ int RoutePopupMenu::nonSyntiTrackAddSyntis(MusECore::AudioTrack* t, PopupMenu* l
for(int ch = 0; ch < chans; ++ch)
{
char buffer[128];
- snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2);
+ snprintf(buffer, 128, "%s %d,%d", tr("Channel").toLatin1().constData(), ch+1, ch+2);
act = chpup->addAction(QString(buffer));
act->setCheckable(true);
diff --git a/muse2/muse/widgets/shortcutcapturedialog.cpp b/muse2/muse/widgets/shortcutcapturedialog.cpp
index 46a3e75d..ad78a2ad 100644
--- a/muse2/muse/widgets/shortcutcapturedialog.cpp
+++ b/muse2/muse/widgets/shortcutcapturedialog.cpp
@@ -30,7 +30,6 @@
//
// Description:
// Dialog window for capturing keyboard shortcuts
-//
#include "shortcutcapturedialog.h"
#include "shortcuts.h"
@@ -39,6 +38,7 @@
#include <QKeySequence>
#include <QInputEvent>
#include <QChar>
+#include <QApplication>
namespace MusEGui {
@@ -105,7 +105,7 @@ void ShortcutCaptureDialog::keyPressEvent(QKeyEvent* e)
(( shortcuts[i].type & (shortcuts[shortcutindex].type | INVIS_SHRT)) ||
shortcuts[i].type & GLOBAL_SHRT ||
shortcuts[shortcutindex].type & GLOBAL_SHRT)) { // affect the same scope
- msgString = tr("Shortcut conflicts with %1").arg(shortcuts[i].descr);
+ msgString = tr("Shortcut conflicts with %1").arg(qApp->translate("shortcuts",shortcuts[i].descr));
conflict = true;
break;
}
diff --git a/muse2/muse/widgets/shortcutconfig.cpp b/muse2/muse/widgets/shortcutconfig.cpp
index fc08e7ce..609564cc 100644
--- a/muse2/muse/widgets/shortcutconfig.cpp
+++ b/muse2/muse/widgets/shortcutconfig.cpp
@@ -30,12 +30,12 @@
//
// Description:
// Dialog for configuring keyboard shortcuts
-//
#include <QCloseEvent>
#include <QKeySequence>
#include <QString>
#include <QSettings>
+#include <QApplication>
#include "shortcutconfig.h"
#include "shortcutcapturedialog.h"
@@ -86,12 +86,12 @@ void ShortcutConfig::updateSCListView(int category)
for (int i=0; i < SHRT_NUM_OF_ELEMENTS; i++) {
if (shortcuts[i].type & category) {
newItem = new SCListViewItem(scListView, i);
- newItem->setText(SHRT_DESCR_COL, tr(shortcuts[i].descr));
+ newItem->setText(SHRT_DESCR_COL, qApp->translate("shortcuts", shortcuts[i].descr));
//if(category == ALL_SHRT)
// catpre = QString(shortcut_category[shortcuts[i].type].name) + QString(": ");
//else
// catpre.clear();
- //newItem->setText(SHRT_DESCR_COL, catpre + tr(shortcuts[i].descr)); // Tim
+ //newItem->setText(SHRT_DESCR_COL, catpre + tr(qApp->translate("shortcuts", shortcuts[i].descr)); // Tim
QKeySequence key = QKeySequence(shortcuts[i].key);
newItem->setText(SHRT_SHRTCUT_COL, key);
}
diff --git a/muse2/muse/widgets/shortcutconfigbase.ui b/muse2/muse/widgets/shortcutconfigbase.ui
index 119a7007..6dd5d5b7 100644
--- a/muse2/muse/widgets/shortcutconfigbase.ui
+++ b/muse2/muse/widgets/shortcutconfigbase.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>466</width>
- <height>403</height>
+ <width>512</width>
+ <height>452</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,67 +16,64 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox3">
- <property name="title">
- <string/>
+ <widget class="QSplitter" name="splitter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>3</number>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="childrenCollapsible">
+ <bool>false</bool>
+ </property>
+ <widget class="QTreeWidget" name="cgListView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>105</width>
+ <height>200</height>
+ </size>
+ </property>
+ <column>
+ <property name="text">
+ <string>Shortcut Category</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QTreeWidget" name="scListView">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>2</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="margin">
- <number>0</number>
+ <property name="minimumSize">
+ <size>
+ <width>170</width>
+ <height>230</height>
+ </size>
</property>
- <item>
- <widget class="QTreeWidget" name="cgListView">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>105</width>
- <height>200</height>
- </size>
- </property>
- <column>
- <property name="text">
- <string>Shortcut Category</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <widget class="QTreeWidget" name="scListView">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>170</width>
- <height>230</height>
- </size>
- </property>
- <column>
- <property name="text">
- <string>Shortcut</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Description</string>
- </property>
- </column>
- </widget>
- </item>
- </layout>
+ <column>
+ <property name="text">
+ <string>Shortcut</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Description</string>
+ </property>
+ </column>
+ </widget>
</widget>
</item>
<item>
diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp
index 3174260f..589726a9 100644
--- a/muse2/muse/widgets/tb1.cpp
+++ b/muse2/muse/widgets/tb1.cpp
@@ -20,7 +20,6 @@
//
//=========================================================
-//#include <assert.h>
#include <stdio.h>
#include <values.h>
@@ -45,9 +44,9 @@ static int rasterTable[] = {
};
static const char* rasterStrings[] = {
- QT_TRANSLATE_NOOP("@default", "Off"), "2pp", "5pp", "64T", "32T", "16T", "8T", "4T", "2T", "1T",
- QT_TRANSLATE_NOOP("@default", "Off"), "3pp", "6pp", "64", "32", "16", "8", "4", "2", "1",
- QT_TRANSLATE_NOOP("@default", "Off"), "4pp", "7pp", "64.", "32.", "16.", "8.", "4.", "2.", "1."
+ QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "2pp", "5pp", "64T", "32T", "16T", "8T", "4T", "2T", "1T",
+ QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "3pp", "6pp", "64", "32", "16", "8", "4", "2", "1",
+ QT_TRANSLATE_NOOP("MusEGui::Toolbar1", "Off"), "4pp", "7pp", "64.", "32.", "16.", "8.", "4.", "2.", "1."
};
diff --git a/muse2/muse/widgets/tools.cpp b/muse2/muse/widgets/tools.cpp
index 162d2b97..d46126a9 100644
--- a/muse2/muse/widgets/tools.cpp
+++ b/muse2/muse/widgets/tools.cpp
@@ -30,42 +30,42 @@
namespace MusEGui {
-const char* infoPointer = QT_TRANSLATE_NOOP("@default", "select Pointer Tool:\n"
+const char* infoPointer = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Pointer Tool:\n"
"with the pointer tool you can:\n"
" select parts\n"
" move parts\n"
" copy parts");
-const char* infoPencil = QT_TRANSLATE_NOOP("@default", "select Pencil Tool:\n"
+const char* infoPencil = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Pencil Tool:\n"
"with the pencil tool you can:\n"
" create new parts\n"
" modify length of parts");
-const char* infoDel = QT_TRANSLATE_NOOP("@default", "select Delete Tool:\n"
+const char* infoDel = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Delete Tool:\n"
"with the delete tool you can delete parts");
-const char* infoCut = QT_TRANSLATE_NOOP("@default", "select Cut Tool:\n"
+const char* infoCut = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Cut Tool:\n"
"with the cut tool you can split a part");
-const char* infoGlue = QT_TRANSLATE_NOOP("@default", "select Glue Tool:\n"
+const char* infoGlue = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Glue Tool:\n"
"with the glue tool you can glue two parts");
-const char* infoScore = QT_TRANSLATE_NOOP("@default", "select Score Tool:\n");
-const char* infoQuant = QT_TRANSLATE_NOOP("@default", "select Quantize Tool:\n"
+const char* infoScore = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Score Tool:\n");
+const char* infoQuant = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Quantize Tool:\n"
"insert display quantize event");
-const char* infoDraw = QT_TRANSLATE_NOOP("@default", "select Drawing Tool");
-const char* infoMute = QT_TRANSLATE_NOOP("@default", "select Muting Tool:\n"
+const char* infoDraw = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Drawing Tool");
+const char* infoMute = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "select Muting Tool:\n"
"click on part to mute/unmute");
-const char* infoAutomation = QT_TRANSLATE_NOOP("@default", "Manipulate automation");
-const char* infoCursor = QT_TRANSLATE_NOOP("@default", "Cursor tool");
+const char* infoAutomation = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "Manipulate automation");
+const char* infoCursor = QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "Cursor tool");
ToolB toolList[] = {
- {&pointerIcon, QT_TRANSLATE_NOOP("@default", "pointer"), infoPointer },
- {&pencilIcon, QT_TRANSLATE_NOOP("@default", "pencil"), infoPencil },
- {&deleteIcon, QT_TRANSLATE_NOOP("@default", "eraser"), infoDel },
- {&cutIcon, QT_TRANSLATE_NOOP("@default", "cutter"), infoCut },
- {&note1Icon, QT_TRANSLATE_NOOP("@default", "score"), infoScore },
- {&glueIcon, QT_TRANSLATE_NOOP("@default", "glue"), infoGlue },
- {&quantIcon, QT_TRANSLATE_NOOP("@default", "quantize"), infoQuant },
- {&drawIcon, QT_TRANSLATE_NOOP("@default", "draw"), infoDraw },
- {&editmuteIcon, QT_TRANSLATE_NOOP("@default", "mute parts"), infoMute },
- {&drawIcon, QT_TRANSLATE_NOOP("@default", "edit automation"),infoAutomation},
- {&cursorIcon, QT_TRANSLATE_NOOP("@default", "cursor"), infoCursor},
+ {&pointerIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "pointer"), infoPointer },
+ {&pencilIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "pencil"), infoPencil },
+ {&deleteIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "eraser"), infoDel },
+ {&cutIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "cutter"), infoCut },
+ {&note1Icon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "score"), infoScore },
+ {&glueIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "glue"), infoGlue },
+ {&quantIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "quantize"), infoQuant },
+ {&drawIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "draw"), infoDraw },
+ {&editmuteIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "mute parts"), infoMute },
+ {&drawIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "edit automation"),infoAutomation},
+ {&cursorIcon, QT_TRANSLATE_NOOP("MusEGui::EditToolBar", "cursor"), infoCursor},
};
//---------------------------------------------------------
@@ -94,7 +94,7 @@ EditToolBar::EditToolBar(QWidget* parent, int tools, const char*)
continue;
ToolB* t = &toolList[i];
- Action* a = new Action(action, 1<<i, t->tip, true);
+ Action* a = new Action(action, 1<<i, tr(t->tip).toAscii().data(), true);
actions[n] = a;
//a->setIconSet(QIcon(**(t->icon)));
a->setIcon(QIcon(**(t->icon)));
diff --git a/muse2/muse/widgets/visibletracks.cpp b/muse2/muse/widgets/visibletracks.cpp
index 84e7dd42..f8ce06bf 100644
--- a/muse2/muse/widgets/visibletracks.cpp
+++ b/muse2/muse/widgets/visibletracks.cpp
@@ -32,22 +32,22 @@
namespace MusEGui {
-const char* waveTrack = QT_TRANSLATE_NOOP("@default", "Show wave tracks");
-const char* groupTrack = QT_TRANSLATE_NOOP("@default", "Show group tracks");
-const char* auxTrack = QT_TRANSLATE_NOOP("@default", "Show aux tracks");
-const char* inputTrack = QT_TRANSLATE_NOOP("@default", "Show input tracks");
-const char* outputTrack = QT_TRANSLATE_NOOP("@default", "Show output tracks");
-const char* midiTrack = QT_TRANSLATE_NOOP("@default", "Show midi tracks");
-const char* synthTrack = QT_TRANSLATE_NOOP("@default", "Show synth tracks");
+const char* waveTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show wave tracks");
+const char* groupTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show group tracks");
+const char* auxTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show aux tracks");
+const char* inputTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show input tracks");
+const char* outputTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show output tracks");
+const char* midiTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show midi tracks");
+const char* synthTrack = QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show synth tracks");
VisibleToolB visTrackList[] = {
- {&addtrack_wavetrackIcon, QT_TRANSLATE_NOOP("@default", "Show wave tracks"), waveTrack },
- {&addtrack_audiogroupIcon, QT_TRANSLATE_NOOP("@default", "Show group tracks"), groupTrack },
- {&addtrack_auxsendIcon, QT_TRANSLATE_NOOP("@default", "Show aux tracks"), auxTrack },
- {&addtrack_audioinputIcon, QT_TRANSLATE_NOOP("@default", "Show input tracks"), inputTrack },
- {&addtrack_audiooutputIcon, QT_TRANSLATE_NOOP("@default", "Show output tracks"), outputTrack },
- {&addtrack_addmiditrackIcon,QT_TRANSLATE_NOOP("@default", "Show midi tracks"), midiTrack },
- {&synthIcon, QT_TRANSLATE_NOOP("@default", "Show synth tracks"), midiTrack },
+ {&addtrack_wavetrackIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show wave tracks"), waveTrack },
+ {&addtrack_audiogroupIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show group tracks"), groupTrack },
+ {&addtrack_auxsendIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show aux tracks"), auxTrack },
+ {&addtrack_audioinputIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show input tracks"), inputTrack },
+ {&addtrack_audiooutputIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show output tracks"), outputTrack },
+ {&addtrack_addmiditrackIcon,QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show midi tracks"), midiTrack },
+ {&synthIcon, QT_TRANSLATE_NOOP("MusEGui::VisibleTracks", "Show synth tracks"), midiTrack },
};
//---------------------------------------------------------
@@ -67,7 +67,7 @@ VisibleTracks::VisibleTracks(QWidget* parent, const char*)
for (unsigned i = 0; i < sizeof(visTrackList)/sizeof(*visTrackList); ++i) {
VisibleToolB* t = &visTrackList[i];
- Action* a = new Action(action, i, t->tip, true);
+ Action* a = new Action(action, i, tr(t->tip).toAscii().data(), true);
actions[n] = a;
//a->setIconSet(QIcon(**(t->icon)));
a->setIcon(QIcon(**(t->icon)));
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 05:06:58 +0000