From 5b633a25eeef9e52233a4f1c0f7ec53b0863342e Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Fri, 29 Apr 2011 18:41:48 -0400 Subject: [PATCH] more ui tweaks --- src/settingsdialog.cpp | 13 +- src/stackedsettingsdialog.ui | 379 ++++++++++++++++++----------------- 2 files changed, 206 insertions(+), 186 deletions(-) diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index b5e301421..26da968e1 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -159,12 +159,6 @@ SettingsDialog::createIcons() accountsButton->setTextAlignment( Qt::AlignHCenter ); accountsButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); - QListWidgetItem *advancedButton = new QListWidgetItem( ui->listWidget ); - advancedButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) ); - advancedButton->setText( tr( "Advanced" ) ); - advancedButton->setTextAlignment( Qt::AlignHCenter ); - advancedButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); - QListWidgetItem *musicButton = new QListWidgetItem( ui->listWidget ); musicButton->setIcon( QIcon( RESPATH "images/music-settings.png" ) ); musicButton->setText( tr( "Music" ) ); @@ -183,6 +177,13 @@ SettingsDialog::createIcons() resolversButton->setTextAlignment( Qt::AlignHCenter ); resolversButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); + QListWidgetItem *advancedButton = new QListWidgetItem( ui->listWidget ); + advancedButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) ); + advancedButton->setText( tr( "Advanced" ) ); + advancedButton->setTextAlignment( Qt::AlignHCenter ); + advancedButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled ); + + connect( ui->listWidget, SIGNAL( currentItemChanged( QListWidgetItem* ,QListWidgetItem* ) ), this, SLOT( changePage( QListWidgetItem*, QListWidgetItem* ) ) ); } diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui index 18ad8ff62..15db3cd58 100644 --- a/src/stackedsettingsdialog.ui +++ b/src/stackedsettingsdialog.ui @@ -47,207 +47,49 @@ - 4 + 0 - + 0 - - - 0 - - - false - - - false - - - true - - - true - - - false - - - - - - - - - 0 - - - - - - 0 - 0 - - + - Advanced Network Settings + Accounts - + 2 - - - - - - - - - 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 + Connect to your friends with Google Chat, Twitter, and more. - - - Qt::RightToLeft + + + 0 - - Use UPnP to establish port forward + + false - + + false + + true + + true + + + false + @@ -503,6 +345,183 @@ verticalSpacer_4 groupBox_3 + + + + 0 + + + + + + 0 + 0 + + + + Advanced Network Settings + + + + 2 + + + + + + + + + + + 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 + + + Use UPnP to establish port forward + + + true + + + + + + + +