diff options
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/preferences.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/preferences.h | 2 | ||||
| -rw-r--r-- | qt-ui/usermanual.ui | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 1e21f4a59..2cde8d992 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -70,6 +70,9 @@ MainWindow::MainWindow() : QMainWindow(), m_Instance = this; ui.setupUi(this); setWindowIcon(QIcon(":subsurface-icon")); + if (!QIcon::hasThemeIcon("window-close")) { + QIcon::setThemeName("subsurface"); + } connect(ui.ListWidget, SIGNAL(currentDiveChanged(int)), this, SLOT(current_dive_changed(int))); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(readSettings())); connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), ui.ListWidget, SLOT(update())); diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index 6d16b810a..ef37c10c1 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -25,7 +25,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial ui.proxyType->addItem(tr("HTTP proxy"), QNetworkProxy::HttpProxy); ui.proxyType->addItem(tr("SOCKS proxy"), QNetworkProxy::Socks5Proxy); ui.proxyType->setCurrentIndex(-1); - connect(ui.proxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(on_proxyType_changed(int))); + connect(ui.proxyType, SIGNAL(currentIndexChanged(int)), this, SLOT(proxyType_changed(int))); connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *))); connect(ui.gflow, SIGNAL(valueChanged(int)), this, SLOT(gflowChanged(int))); connect(ui.gfhigh, SIGNAL(valueChanged(int)), this, SLOT(gfhighChanged(int))); @@ -413,7 +413,7 @@ void PreferencesDialog::emitSettingsChanged() emit settingsChanged(); } -void PreferencesDialog::on_proxyType_changed(int idx) +void PreferencesDialog::proxyType_changed(int idx) { if (idx == -1) { return; diff --git a/qt-ui/preferences.h b/qt-ui/preferences.h index eb7066b54..ac54cc027 100644 --- a/qt-ui/preferences.h +++ b/qt-ui/preferences.h @@ -27,7 +27,7 @@ slots: void rememberPrefs(); void gflowChanged(int gf); void gfhighChanged(int gf); - void on_proxyType_changed(int idx); + void proxyType_changed(int idx); private: explicit PreferencesDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); diff --git a/qt-ui/usermanual.ui b/qt-ui/usermanual.ui index 506b5c2ca..e8f0095f5 100644 --- a/qt-ui/usermanual.ui +++ b/qt-ui/usermanual.ui @@ -74,7 +74,7 @@ <string/> </property> <property name="icon"> - <iconset theme="go-previous"> + <iconset theme="go-up"> <normaloff/> </iconset> </property> @@ -98,7 +98,7 @@ <string/> </property> <property name="icon"> - <iconset theme="go-next"> + <iconset theme="go-down"> <normaloff/> </iconset> </property> |