From 1ff142616ea6067cb8d162bf2b5bc3fcfb4f8116 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Mon, 6 Jun 2011 16:28:11 -0400 Subject: [PATCH] remove old settings dialog.ui, just caused confusion --- src/CMakeLists.txt | 1 - src/settingsdialog.ui | 740 ------------------------------------------ thirdparty/jreen | 2 +- 3 files changed, 1 insertion(+), 742 deletions(-) delete mode 100644 src/settingsdialog.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b19d127d2..a7d4dc7d1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -118,7 +118,6 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui} SET( tomahawkUI ${tomahawkUI} tomahawkwindow.ui - settingsdialog.ui diagnosticsdialog.ui stackedsettingsdialog.ui proxydialog.ui diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui deleted file mode 100644 index 3ccf7d55e..000000000 --- a/src/settingsdialog.ui +++ /dev/null @@ -1,740 +0,0 @@ - - - SettingsDialog - - - - 0 - 0 - 621 - 434 - - - - - 0 - 353 - - - - Music Player Settings - - - - - - 0 - - - - Accounts - - - - - - 0 - - - false - - - false - - - true - - - true - - - false - - - - - - - - Jabber - - - - 16 - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Jabber ID: - - - jabberUsername - - - - - - - - 0 - 0 - - - - e.g. user@example.com - - - - - - - - 0 - 0 - - - - Password: - - - jabberPassword - - - - - - - - 0 - 0 - - - - - - - QLineEdit::Password - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 8 - - - - - - - - true - - - - 0 - 0 - - - - Advanced Jabber Settings - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - Server: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - jabberServer - - - - - - - - 0 - 0 - - - - - - - - Port: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 90 - 0 - - - - - 90 - 16777215 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1 - - - 65535 - - - 5222 - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Network - - - - - - - 0 - 0 - - - - Advanced Network Settings - - - - - - - - - - - - 0 - 0 - - - - If you're having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine! - - - true - - - - - - - - - - 0 - 0 - - - - Static Host Name: - - - - - - - - - - - 0 - 0 - - - - Static Port: - - - - - - - 65535 - - - 50210 - - - - - - - - - Qt::RightToLeft - - - Always use static host name/port? (Overrides UPnP discovery/port forwarding) - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Proxy Settings... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::RightToLeft - - - Playdar HTTP API - - - true - - - - - - - Qt::RightToLeft - - - Connect automatically when Tomahawk starts - - - true - - - - - - - Qt::RightToLeft - - - Use UPnP to establish port forward - - - true - - - - - - - - - - - Local Music - - - - 16 - - - - - - - Path to scan for music files: - - - - - - - - - - - - ... - - - - - - - - - - 0 - 0 - - - - Watch for changes - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Last.fm - - - - 16 - - - - - Scrobble tracks to Last.fm - - - - - - - Last.fm Login - - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - - - - - - - - Test Login - - - - - - - Qt::Vertical - - - - 20 - 221 - - - - - - - - - - - - Script Resolvers - - - - - - Loaded script resolvers: - - - - - - - - - true - - - QAbstractItemView::SingleSelection - - - false - - - true - - - false - - - true - - - true - - - - - - - - - - - - - :/data/images/list-add.png:/data/images/list-add.png - - - - - - - - - - - :/data/images/list-remove.png:/data/images/list-remove.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - buttonBox - accepted() - SettingsDialog - accept() - - - 402 - 348 - - - 157 - 274 - - - - - buttonBox - rejected() - SettingsDialog - reject() - - - 470 - 348 - - - 286 - 274 - - - - - diff --git a/thirdparty/jreen b/thirdparty/jreen index 2957d0ff0..8f995f246 160000 --- a/thirdparty/jreen +++ b/thirdparty/jreen @@ -1 +1 @@ -Subproject commit 2957d0ff03d9561af8afc4bd3a45947392868875 +Subproject commit 8f995f246637f533feb7124744e113034a32b505