diff --git a/launcher/ui/pages/global/APIPage.ui b/launcher/ui/pages/global/APIPage.ui index 9352162f0..c6a4593fc 100644 --- a/launcher/ui/pages/global/APIPage.ui +++ b/launcher/ui/pages/global/APIPage.ui @@ -32,7 +32,7 @@ 0 - 0 + -216 816 832 @@ -55,7 +55,14 @@ - + + + + 0 + 0 + + + diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui index 8f5eb69d5..22ac6a018 100644 --- a/launcher/ui/pages/global/LauncherPage.ui +++ b/launcher/ui/pages/global/LauncherPage.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 700 + 767 + 796 @@ -41,9 +41,9 @@ 0 - -672 - 575 - 1368 + -356 + 742 + 1148 @@ -55,7 +55,7 @@ User Interface - + @@ -102,7 +102,7 @@ - When Renaming Instances... + Instance Renaming @@ -165,65 +165,60 @@ Updater - - + + + + + + + How Often? + + + + + + + + 0 + 0 + + + + Set to 0 to only check on launch + + + On Launch + + + hours + + + Every + + + 0 + + + 168 + + + + + + + Qt::Horizontal + + + + + + Check for updates automatically - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - - - How Often? - - - - - - - - 0 - 0 - - - - Set to 0 to only check on launch - - - On Launch - - - hours - - - Every - - - 0 - - - 168 - - - @@ -232,24 +227,14 @@ Folders - - - - - &Icons - - - iconsDirTextBox - - + + + - - + + - &Downloads - - - downloadsDirTextBox + Browse @@ -263,39 +248,6 @@ - - - - &Skins - - - skinsDirTextBox - - - - - - - I&nstances - - - instDirTextBox - - - - - - - - - - Browse - - - - - - @@ -303,40 +255,13 @@ - - - - - - - - - - - + + - Browse + &Skins - - - - - - Browse - - - - - - - Browse - - - - - - - Browse + + skinsDirTextBox @@ -350,9 +275,79 @@ + + + + Browse + + + + + + + &Downloads + + + downloadsDirTextBox + + + + + + + + + + I&nstances + + + instDirTextBox + + + + + + + Browse + + + + + + + Browse + + + + + + + + + + Browse + + + + + + + + + + + + + &Icons + + + iconsDirTextBox + + + @@ -430,9 +425,18 @@ Console - - + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + 0 + 0 + + Log History &Limit @@ -441,7 +445,7 @@ - + @@ -466,23 +470,7 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - + &Stop logging when log overflows @@ -497,99 +485,8 @@ Tasks - - - - - Number of concurrent tasks - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - 1 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - - - Number of concurrent downloads - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - 1 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - - - Number of manual retries - - - - + + @@ -608,33 +505,26 @@ - - - - Qt::Vertical + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 0 - 6 + 60 + 0 - - - - - - Seconds to wait until the requests are terminated - - - Timeout for HTTP requests + + 1 - + @@ -653,6 +543,63 @@ + + + + Retry Limit + + + + + + + Concurrent Download Limit + + + + + + + Seconds to wait until the requests are terminated + + + HTTP Timeout + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + 1 + + + + + + + Concurrent Task Limit + + + + + + + Qt::Horizontal + + + @@ -678,21 +625,8 @@ scrollArea autoUpdateCheckBox - instDirTextBox - instDirBrowseBtn - modsDirTextBox - modsDirBrowseBtn - iconsDirTextBox - iconsDirBrowseBtn - javaDirTextBox - javaDirBrowseBtn - skinsDirTextBox - skinsDirBrowseBtn - downloadsDirTextBox - downloadsDirBrowseBtn metadataEnableBtn dependenciesEnableBtn - sortByNameBtn diff --git a/launcher/ui/pages/global/ProxyPage.ui b/launcher/ui/pages/global/ProxyPage.ui index c8882a9dd..3042a4bba 100644 --- a/launcher/ui/pages/global/ProxyPage.ui +++ b/launcher/ui/pages/global/ProxyPage.ui @@ -51,7 +51,7 @@ Uses your system's default proxy settings. - S&ystem Settings + Use S&ystem Settings proxyGroup @@ -99,6 +99,18 @@ + + + 0 + 0 + + + + + 300 + 0 + + 127.0.0.1 @@ -120,6 +132,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -128,30 +153,30 @@ Authentication - - - - - - - - Note: Proxy username and password are stored in plain text inside the launcher's configuration file! - - - true - - - + - &Username: + &Username proxyUserEdit + + + + + + + &Password + + + proxyPassEdit + + + @@ -159,13 +184,13 @@ - - + + - &Password: + Note: Proxy username and password are stored in plain text inside the launcher's configuration file! - - proxyPassEdit + + true diff --git a/launcher/ui/widgets/AppearanceWidget.ui b/launcher/ui/widgets/AppearanceWidget.ui index deb5a94d4..d56e6f031 100644 --- a/launcher/ui/widgets/AppearanceWidget.ui +++ b/launcher/ui/widgets/AppearanceWidget.ui @@ -142,9 +142,65 @@ - + + + + + Console Font + + + + + + + + + + + 0 + 0 + + + + 5 + + + 16 + + + 11 + + + + + + + Qt::Horizontal + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 6 + + + + + + - Console Font + Cat Opacity @@ -169,48 +225,9 @@ 0 - - - - - - - 5 - - - 16 - - - 11 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - - - Cat Opacity - - - @@ -232,20 +249,34 @@ 0 - + + + + false + + + Opaque + + + + Qt::Horizontal - - - 40 - 20 - - - + + + + false + + + Transparent + + + + @@ -261,29 +292,25 @@ - - - - false - - - Transparent - - - - - - - false - - - Opaque - - - + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 0 + 6 + + + + @@ -499,12 +526,6 @@ Qt::Horizontal - - - 0 - 0 - - @@ -545,8 +566,6 @@ catPackComboBox catPackFolder reloadThemesButton - consoleFont - fontSizeBox catOpacitySlider diff --git a/launcher/ui/widgets/JavaSettingsWidget.ui b/launcher/ui/widgets/JavaSettingsWidget.ui index 4028ca544..027b20d2f 100644 --- a/launcher/ui/widgets/JavaSettingsWidget.ui +++ b/launcher/ui/widgets/JavaSettingsWidget.ui @@ -7,13 +7,13 @@ 0 0 500 - 1123 + 1000 Form - + @@ -190,126 +190,22 @@ false - - - + + + - M&inimum Memory Usage (-Xms) - - - minMemSpinBox + Memory Notice - - - - - 0 - 0 - - - - The amount of memory Minecraft is started with. - - - MiB - - - 8 - - - 1048576 - - - 128 - - - 256 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - + + - Ma&ximum Memory Usage (-Xmx) - - - maxMemSpinBox + (-XX:PermSize) - - - - - 0 - 0 - - - - The maximum amount of memory Minecraft is allowed to use. - - - MiB - - - 8 - - - 1048576 - - - 128 - - - 1024 - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - - - &PermGen Size (-XX:PermSize) - - - permGenSpinBox - - - - + @@ -337,29 +233,119 @@ - - - - Qt::Vertical + + + + + 0 + 0 + - - QSizePolicy::Fixed + + The maximum amount of memory Minecraft is allowed to use. + + + MiB + + + 8 + + + 1048576 + + + 128 + + + 1024 + + + + + + + (-Xmx) + + + + + + + + 0 + 0 + + + + The amount of memory Minecraft is started with. + + + MiB + + + 8 + + + 1048576 + + + 128 + + + 256 + + + + + + + &PermGen Size + + + permGenSpinBox + + + + + + + (-Xms) + + + + + + + Ma&ximum Memory + + + maxMemSpinBox + + + + + + + M&inimum Memory + + + minMemSpinBox + + + + + + + Qt::Horizontal 0 - 6 + 0 - - - - Memory Notice - - - @@ -393,9 +379,6 @@ skipWizardCheckBox autodetectJavaCheckBox autodownloadJavaCheckBox - minMemSpinBox - maxMemSpinBox - permGenSpinBox jvmArgsTextBox diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.ui b/launcher/ui/widgets/MinecraftSettingsWidget.ui index 4c317c15d..9a9adb8b7 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.ui +++ b/launcher/ui/widgets/MinecraftSettingsWidget.ui @@ -7,7 +7,7 @@ 0 0 648 - 400 + 600 @@ -58,9 +58,9 @@ 0 - -130 + 0 603 - 812 + 694 @@ -78,15 +78,8 @@ false - - - - - Start Minecraft maximized - - - - + + The base game only supports resolution. In order to simulate the maximized behaviour the current implementation approximates the maximum display size. @@ -96,111 +89,53 @@ - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 0 - 6 - - - - - - + + - &Window Size - - - windowWidthSpinBox + When the game window closes, quit the launcher - - - - - - - 0 - 0 - - - - - - - 1 - - - 65536 - - - 480 - - - - - - - × - - - - - - - - 0 - 0 - - - - - - - 1 - - - 65536 - - - 1 - - - 854 - - - - - - - pixels - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + Start Minecraft maximized + + - + + + + When the game window opens, hide the launcher + + + + + + + + 0 + 0 + + + + + + + 1 + + + 65536 + + + 1 + + + 854 + + + + Qt::Vertical @@ -216,20 +151,65 @@ - - - - When the game window opens, hide the launcher + + + + + 0 + 0 + + + + + + + 1 + + + 65536 + + + 480 - - + + - When the game window closes, quit the launcher + &Window Size + + + windowWidthSpinBox + + + + × + + + + + + + pixels + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + @@ -329,15 +309,9 @@ false - + - - - 0 - 0 - - Account @@ -353,6 +327,19 @@ + + + + Qt::Horizontal + + + + 0 + 0 + + + + @@ -367,15 +354,32 @@ false - - + + + + + + 0 + 0 + + + + + + + + Singleplayer world + + + + Server address - + @@ -385,22 +389,12 @@ - - - - Singleplayer world + + + + Qt::Horizontal - - - - - - - 0 - 0 - - - + @@ -440,7 +434,7 @@ 0 0 624 - 287 + 487 @@ -463,8 +457,8 @@ 0 0 - 603 - 470 + 624 + 487 @@ -507,15 +501,11 @@ false - - - - - Use system installation of OpenAL - - - - + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + &GLFW library path @@ -525,31 +515,7 @@ - - - - false - - - - - - - Use system installation of GLFW - - - - - - - &OpenAL library path - - - lineEditOpenALPath - - - - + Qt::Vertical @@ -565,13 +531,44 @@ - + + + + &OpenAL library path + + + lineEditOpenALPath + + + + false + + + + Use system installation of GLFW + + + + + + + Use system installation of OpenAL + + + + + + + false + + + @@ -715,7 +712,6 @@ javaScrollArea scrollArea_2 onlineFixes - useNativeGLFWCheck useNativeOpenALCheck perfomanceGroupBox enableFeralGamemodeCheck diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui deleted file mode 100644 index 3e2808a48..000000000 --- a/launcher/ui/widgets/ThemeCustomizationWidget.ui +++ /dev/null @@ -1,171 +0,0 @@ - - - ThemeCustomizationWidget - - - - 0 - 0 - 400 - 168 - - - - Form - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - - - - - &Widgets - - - widgetStyleComboBox - - - - - - - View widget themes folder. - - - Open Folder - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - - - - - View icon themes folder. - - - Open Folder - - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar. - - - C&at - - - backgroundCatComboBox - - - - - - - &Icons - - - iconsComboBox - - - - - - - View cat packs folder. - - - Open Folder - - - - - - - - 0 - 0 - - - - Qt::StrongFocus - - - The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar. - - - - - - - Refresh All - - - - - - - iconsComboBox - iconsFolder - widgetStyleComboBox - widgetStyleFolder - backgroundCatComboBox - catPackFolder - - - -