Changeset 019894f5ef in tspsg for src

Timestamp:

Apr 15, 2011, 6:28:48 AM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

f6352492e7

Parents:

27b1dca32b

git-author:

Oleksii Serdiuk <contacts@…> (04/15/11 06:28:48)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:45:59)

Message:

• Made some small corrections to different texts.
• FIX: Icons in toolbar configuration dialog didn't follow style and one of them wasn't shown.

Location:

src

Files:

• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/128x128/go-down.png (moved) (moved from src/3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/go-down.png)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/128x128/go-next.png (moved) (moved from src/3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/go-next.png)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/128x128/go-up.png (moved) (moved from src/3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/go-up.png)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/128x128/list-add.png (moved) (moved from src/3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/list-add.png)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/128x128/list-remove.png (moved) (moved from src/3rdparty/qttoolbardialog-2.2_1-opensource/src/images/icons/list-remove.png)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp (modified) (1 diff)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.qrc (modified) (1 diff)
• mainwindow.cpp (modified) (3 diffs)
• tspmodel.cpp (modified) (1 diff)

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

@@ -1812 +1812 @@
 //    ui.currentToolBarList->setAcceptDrops(true);
 
-        d_ptr->ui.upButton->setIcon(QIcon(":/images/icons/go-up.png"));
-        d_ptr->ui.downButton->setIcon(QIcon(":/images/icons/go-down.png"));
-        d_ptr->ui.leftButton->setIcon(QIcon(":/images/icons/go-previous.png"));
-        d_ptr->ui.rightButton->setIcon(QIcon(":/images/icons/go-next.png"));
-        d_ptr->ui.newButton->setIcon(QIcon(":/images/icons/list-add.png"));
-        d_ptr->ui.removeButton->setIcon(QIcon(":/images/icons/list-remove.png"));
+    d_ptr->ui.upButton->setIcon(GET_ICON("go-up"));
+    d_ptr->ui.downButton->setIcon(GET_ICON("go-down"));
+    d_ptr->ui.leftButton->setIcon(GET_ICON("go-previous"));
+    d_ptr->ui.rightButton->setIcon(GET_ICON("go-next"));
+    d_ptr->ui.newButton->setIcon(GET_ICON("list-add"));
+    d_ptr->ui.removeButton->setIcon(GET_ICON("list-remove"));
 
     connect(d_ptr->ui.newButton, SIGNAL(clicked()), this, SLOT(newClicked()));

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.qrc

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/">
-        <file>images/icons/go-down.png</file>
-        <file>images/icons/go-next.png</file>
-        <file>images/icons/go-up.png</file>
-        <file>images/icons/list-add.png</file>
-        <file>images/icons/list-remove.png</file>
+        <file>images/icons/128x128/go-down.png</file>
+        <file>images/icons/128x128/go-next.png</file>
+        <file>images/icons/128x128/go-up.png</file>
+        <file>images/icons/128x128/list-add.png</file>
+        <file>images/icons/128x128/list-remove.png</file>
     </qresource>
 </RCC>

src/mainwindow.cpp

@@ -524 +524 @@
 {
     if (!hasUpdater()) {
-        QMessageBox::warning(this, tr("Unsupported Feature"), tr("Sorry, but this feature is not supported on your platform\nor support for this feature was not installed."));
+        QMessageBox::warning(this, tr("Unsupported Feature"), tr("Sorry, but this feature is not supported on your\nplatform or support for it was not installed."));
         return;
     }
@@ -738 +738 @@
 QPushButton *cancel = new QPushButton(&pd);
     cancel->setIcon(GET_ICON("dialog-cancel"));
-    cancel->setText(QCoreApplication::translate("QDialogButtonBox", "Cancel", "No need to translate this. This translation will be taken from Qt translation files."));
+    cancel->setText(QCoreApplication::translate("QDialogButtonBox", "Cancel", "No need to translate this. The translation will be taken from Qt translation files."));
     pd.setCancelButton(cancel);
     pd.setMaximum(n);
@@ -1857 +1857 @@
 
     QMenu *m = new QMenu(this);
-    m->addAction(QApplication::translate("QDialogButtonBox", "Discard", "No need to translate this. This translation will be taken from Qt translation files."),
+    m->addAction(QApplication::translate("QDialogButtonBox", "Discard", "No need to translate this. The translation will be taken from Qt translation files."),
                  this, SLOT(discard()));
-    m->addAction(QApplication::translate("QDialogButtonBox", "Cancel", "No need to translate this. This translation will be taken from Qt translation files."),
+    m->addAction(QApplication::translate("QDialogButtonBox", "Cancel", "No need to translate this. The translation will be taken from Qt translation files."),
                  this, SLOT(cancel()));
 
-    QAction *o = new QAction(QApplication::translate("QMenuBar", "Actions", "No need to translate this. This translation will be taken from Qt translation files."), this);
+    QAction *o = new QAction(QApplication::translate("QtToolBarDialog", "Actions"), this);
     o->setSoftKeyRole(QAction::NegativeSoftKey);
     o->setMenu(m);

src/tspmodel.cpp

@@ -404 +404 @@
         QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
             + tr("File version (%1) is newer than this version of %3 supports (%2).\n"
-                 "Please, try to update the application. Also, the file might be corrupted.")
+                 "Please, try to update the application. Also, the file could be corrupted.")
                  .arg(version).arg(TSPT_VERSION).arg(QApplication::applicationName()));
         QApplication::restoreOverrideCursor();