diff --git a/src/gui/qt/resources/application_exit.png b/src/gui/qt/resources/application_exit.png new file mode 100644 index 00000000..feb5b646 Binary files /dev/null and b/src/gui/qt/resources/application_exit.png differ diff --git a/src/gui/qt/resources/applications_education.png b/src/gui/qt/resources/applications_education.png new file mode 100644 index 00000000..c0088a58 Binary files /dev/null and b/src/gui/qt/resources/applications_education.png differ diff --git a/src/gui/qt/resources/arrow_left_double.png b/src/gui/qt/resources/arrow_left_double.png new file mode 100644 index 00000000..e2c12da9 Binary files /dev/null and b/src/gui/qt/resources/arrow_left_double.png differ diff --git a/src/gui/qt/resources/arrow_right_double.png b/src/gui/qt/resources/arrow_right_double.png new file mode 100644 index 00000000..5c000585 Binary files /dev/null and b/src/gui/qt/resources/arrow_right_double.png differ diff --git a/src/gui/qt/resources/audio_input_microphone.png b/src/gui/qt/resources/audio_input_microphone.png new file mode 100644 index 00000000..4643da1c Binary files /dev/null and b/src/gui/qt/resources/audio_input_microphone.png differ diff --git a/src/gui/qt/resources/book.png b/src/gui/qt/resources/book.png new file mode 100644 index 00000000..345c700e Binary files /dev/null and b/src/gui/qt/resources/book.png differ diff --git a/src/gui/qt/resources/dialog_close.png b/src/gui/qt/resources/dialog_close.png new file mode 100644 index 00000000..80495b4a Binary files /dev/null and b/src/gui/qt/resources/dialog_close.png differ diff --git a/src/gui/qt/resources/dialog_ok_apply.png b/src/gui/qt/resources/dialog_ok_apply.png new file mode 100644 index 00000000..a9d162d5 Binary files /dev/null and b/src/gui/qt/resources/dialog_ok_apply.png differ diff --git a/src/gui/qt/resources/editdelete.png b/src/gui/qt/resources/editdelete.png new file mode 100644 index 00000000..1ac55fcb Binary files /dev/null and b/src/gui/qt/resources/editdelete.png differ diff --git a/src/gui/qt/resources/filesave.png b/src/gui/qt/resources/filesave.png new file mode 100644 index 00000000..792e84bc Binary files /dev/null and b/src/gui/qt/resources/filesave.png differ diff --git a/src/gui/qt/resources/list_add.png b/src/gui/qt/resources/list_add.png new file mode 100644 index 00000000..0478b7d5 Binary files /dev/null and b/src/gui/qt/resources/list_add.png differ diff --git a/src/gui/qt/resources/list_add_user.png b/src/gui/qt/resources/list_add_user.png new file mode 100644 index 00000000..afae5603 Binary files /dev/null and b/src/gui/qt/resources/list_add_user.png differ diff --git a/src/gui/qt/resources/list_remove_user.png b/src/gui/qt/resources/list_remove_user.png new file mode 100644 index 00000000..aff1605a Binary files /dev/null and b/src/gui/qt/resources/list_remove_user.png differ diff --git a/src/gui/qt/resources/media_podcast.png b/src/gui/qt/resources/media_podcast.png new file mode 100644 index 00000000..21cd054f Binary files /dev/null and b/src/gui/qt/resources/media_podcast.png differ diff --git a/src/gui/qt/resources/pdf.png b/src/gui/qt/resources/pdf.png new file mode 100644 index 00000000..73946b90 Binary files /dev/null and b/src/gui/qt/resources/pdf.png differ diff --git a/src/gui/qt/resources/player_play.png b/src/gui/qt/resources/player_play.png new file mode 100644 index 00000000..c930ee7a Binary files /dev/null and b/src/gui/qt/resources/player_play.png differ diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc new file mode 100644 index 00000000..704daba4 --- /dev/null +++ b/src/gui/qt/resources/pokerth.qrc @@ -0,0 +1,51 @@ + + + media_podcast.png + audio_input_microphone_small.png + book.png + system_users_big.png + document_import.png + document_export.png + bday.png + document_multiple.png + tools_wizard.png + speaker.png + player_stop.png + player_play.png + folder_sound.png + arrow_right_double.png + view_refresh.png + arrow_left_double.png + list_remove_user.png + archive_extract.png + preferences_system_time.png + archive_remove.png + audio_x_monkey.png + user.png + application_exit.png + system_users.png + list_add_user.png + document_new.png + kontact_date.png + list_add.png + applications_education.png + go_jump_today.png + document_properties.png + audio_input_microphone.png + dialog_close.png + systemsettings.png + archive_insert.png + sound.png + document_preview.png + editdelete.png + user_properties.png + printer1.png + pdf.png + view_calendar_day.png + clock.png + preferences_desktop_user.png + dialog_ok_apply.png + filesave.png + view_calendar_list.png + + diff --git a/src/gui/qt/resources/preferences_desktop_user.png b/src/gui/qt/resources/preferences_desktop_user.png new file mode 100644 index 00000000..fdf4f090 Binary files /dev/null and b/src/gui/qt/resources/preferences_desktop_user.png differ diff --git a/src/gui/qt/resources/printer1.png b/src/gui/qt/resources/printer1.png new file mode 100644 index 00000000..323194aa Binary files /dev/null and b/src/gui/qt/resources/printer1.png differ diff --git a/src/gui/qt/resources/speaker.png b/src/gui/qt/resources/speaker.png new file mode 100644 index 00000000..8baaadab Binary files /dev/null and b/src/gui/qt/resources/speaker.png differ diff --git a/src/gui/qt/resources/system_users.png b/src/gui/qt/resources/system_users.png new file mode 100644 index 00000000..f5c56f11 Binary files /dev/null and b/src/gui/qt/resources/system_users.png differ diff --git a/src/gui/qt/resources/system_users_big.png b/src/gui/qt/resources/system_users_big.png new file mode 100644 index 00000000..18fa401a Binary files /dev/null and b/src/gui/qt/resources/system_users_big.png differ diff --git a/src/gui/qt/resources/systemsettings.png b/src/gui/qt/resources/systemsettings.png new file mode 100644 index 00000000..860e424f Binary files /dev/null and b/src/gui/qt/resources/systemsettings.png differ diff --git a/src/gui/qt/resources/tools_wizard.png b/src/gui/qt/resources/tools_wizard.png new file mode 100644 index 00000000..7c020ec5 Binary files /dev/null and b/src/gui/qt/resources/tools_wizard.png differ diff --git a/src/gui/qt/resources/user.png b/src/gui/qt/resources/user.png new file mode 100644 index 00000000..749b40fe Binary files /dev/null and b/src/gui/qt/resources/user.png differ diff --git a/src/gui/qt/resources/user_properties.png b/src/gui/qt/resources/user_properties.png new file mode 100644 index 00000000..cba85b5b Binary files /dev/null and b/src/gui/qt/resources/user_properties.png differ diff --git a/src/gui/qt/resources/view_refresh.png b/src/gui/qt/resources/view_refresh.png new file mode 100644 index 00000000..6d5eb792 Binary files /dev/null and b/src/gui/qt/resources/view_refresh.png differ diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 75d05a16..5437cc81 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -5,21 +5,21 @@ 0 0 - 671 - 688 + 770 + 530 - 671 - 572 + 770 + 530 Settings - - + + @@ -35,6 +35,18 @@ 16777215 + + + 32 + 32 + + + + false + + + true + Interface @@ -44,49 +56,53 @@ Sound - - - - Local Game Settings + + + :/gfx/speaker.png:/gfx/speaker.png - Network Game Settings + Local Game - Internet Game Settings + Network Game - Player Nicks/Avatars + Internet Game + + + + + Nicks/Avatars + + + + :/gfx/system_users.png:/gfx/system_users.png Log Messages + + + :/gfx/applications_education.png:/gfx/applications_education.png + - 0 + 4 - - - 0 - 0 - 455 - 621 - - - + @@ -135,69 +151,73 @@ - - - Show intro on startup - - + + + + + Show intro on startup + + + + + + + Show left toolbox + + + + + + + Show right toolbox + + + + + + + Show statusbar messages + + + + + + + Show fade-out animation for non-winning cards + + + + + + + Show flip-card animation + + + + + + + Show buttons for small blind and big blind + + + + + + + Show own cards only on mouse click + + + + + + + Reverse order of F-Keys (F1 - F4) + + + + - - - Show left toolbox - - - - - - - Show right toolbox - - - - - - - Show statusbar messages - - - - - - - Show fade-out animation for non-winning cards - - - - - - - Show flip-card animation - - - - - - - Show buttons for small blind and big blind - - - - - - - Show own cards only on mouse click - - - - - - - Reverse order of F-Keys (F1 - F4) - - - - Network / Internet Game @@ -213,7 +233,7 @@ - + Flipside of Cards @@ -313,7 +333,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -329,14 +349,6 @@ p, li { white-space: pre-wrap; } - - - 0 - 0 - 455 - 621 - - @@ -468,14 +480,6 @@ p, li { white-space: pre-wrap; } - - - 0 - 0 - 455 - 621 - - @@ -772,14 +776,6 @@ p, li { white-space: pre-wrap; } - - - 0 - 0 - 455 - 621 - - @@ -1070,22 +1066,6 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 14 - - - - @@ -1187,32 +1167,11 @@ p, li { white-space: pre-wrap; } - - - - Qt::Vertical - - - - 400 - 216 - - - - - - - 0 - 0 - 455 - 621 - - - - + + QLabel { font-weight: bold; } @@ -1222,14 +1181,14 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -1242,18 +1201,18 @@ p, li { white-space: pre-wrap; } - + - - Internet Server Settings (Dedicated Server) + + + 285 + 16777215 + - - - 5 - - - 4 - + + Internet Server + + @@ -1262,10 +1221,7 @@ p, li { white-space: pre-wrap; } true - - - 5 - + @@ -1296,10 +1252,7 @@ p, li { white-space: pre-wrap; } false - - - 4 - + @@ -1369,12 +1322,6 @@ p, li { white-space: pre-wrap; } - - - 299 - 0 - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> @@ -1403,48 +1350,15 @@ p, li { white-space: pre-wrap; } - - - - 6 - - - 0 - - - - - Use password for private game: - - - - - - - false - - - QLineEdit::Password - - - - - - + - Enable/Disable Lobby Chat (IRC Server) + Lobby Chat (IRC) true - - - 5 - - - 4 - + @@ -1505,6 +1419,23 @@ p, li { white-space: pre-wrap; } + + + + Channel Password: + + + lineEdit_IRCChannelPassword + + + + + + + QLineEdit::Password + + + @@ -1522,27 +1453,47 @@ p, li { white-space: pre-wrap; } - - - - QLineEdit::Password - - - - - - - Channel Password: - - - lineEdit_IRCChannelPassword - - - - + + + + Qt::Vertical + + + + 20 + 98 + + + + + + + + 0 + + + + + Use password for private game: + + + + + + + false + + + QLineEdit::Password + + + + + + Qt::Vertical @@ -1558,34 +1509,7 @@ p, li { white-space: pre-wrap; } - - - 0 - 0 - 455 - 621 - - - - - 9 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - + @@ -1596,16 +1520,187 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + + + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 200 + 16777215 + + + + Human Player: + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 60 + 60 + + + + + 60 + 60 + + + + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Horizontal + + + + 78 + 20 + + + + + + + + + 0 + 0 + + + + + 100 + 25 + + + + + 100 + 25 + + + + 12 + + + + + + + Qt::Horizontal + + + + 88 + 20 + + + + + + Computer Engine - - 7 + + 1 - + + 0 + + 10 @@ -1614,7 +1709,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -1747,7 +1842,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -1880,7 +1975,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -2013,7 +2108,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -2146,7 +2241,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -2279,7 +2374,7 @@ p, li { white-space: pre-wrap; } 0 - 4 + 0 @@ -2422,265 +2517,22 @@ p, li { white-space: pre-wrap; } - - + + - Qt::Horizontal + Qt::Vertical - - - - - - 0 + + + 20 + 40 + - - 0 - - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - Human Player: - - - Qt::AlignCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 6 - - - 6 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 40 - - - - - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 20 - - - - - - - - - 0 - 0 - - - - - 60 - 60 - - - - - 60 - 60 - - - - - 50 - 50 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 20 - - - - - - - - - - Qt::Horizontal - - - - 20 - 40 - - - - - - - + - - - 0 - 0 - 455 - 621 - - 9 @@ -2840,14 +2692,14 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal - + Qt::Horizontal @@ -2927,15 +2779,12 @@ p, li { white-space: pre-wrap; } lineEdit_InternetServerPassword checkBox_InternetServerUseIpv6 checkBox_InternetServerUseSctp - checkBox_UseInternetGamePassword - lineEdit_InternetGamePassword groupBox_lobbyChat lineEdit_IRCServerAddress spinBox_IRCServerPort lineEdit_IRCChannel lineEdit_IRCChannelPassword checkBox_IRCServerUseIpv6 - pushButton_HumanPlayerAvatar lineEdit_HumanPlayerName pushButton_Opponent1Avatar pushButton_Opponent2Avatar @@ -2956,7 +2805,9 @@ p, li { white-space: pre-wrap; } comboBox_logInterval buttonBox - + + + listWidget diff --git a/src/gui/qt/startwindow.ui b/src/gui/qt/startwindow.ui index 6ed3a237..9e551a12 100644 --- a/src/gui/qt/startwindow.ui +++ b/src/gui/qt/startwindow.ui @@ -106,7 +106,7 @@ 0 0 444 - 28 + 30 @@ -158,11 +158,19 @@ + + + :/gfx/systemsettings.png:/gfx/systemsettings.png + Configure PokerTH ... + + + :/gfx/application_exit.png:/gfx/application_exit.png + Quit @@ -181,7 +189,9 @@ - + + + actionQuit diff --git a/src/pokerth.cpp b/src/pokerth.cpp index ff774a04..fe8e6bdc 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -104,6 +104,7 @@ int main( int argc, char **argv ) // #endif a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); #endif + a.setStyleSheet("QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; dialog-ok-icon: url(:/gfx/dialog_ok_apply.png); dialog-cancel-icon: url(:/gfx/dialog_close.png); dialog-close-icon: url(:/gfx/dialog_close.png);}"); QPixmap *pixmap = new QPixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png"); StartSplash splash(*pixmap);