mirror of
				https://github.com/Swordfish90/cool-retro-term.git
				synced 2025-11-04 00:52:11 +00:00 
			
		
		
		
	Improve settings window.
This commit is contained in:
		@@ -41,11 +41,11 @@ int main(int argc, char *argv[])
 | 
				
			|||||||
#if defined(Q_OS_MAC)
 | 
					#if defined(Q_OS_MAC)
 | 
				
			||||||
    // This allows UTF-8 characters usage in OSX.
 | 
					    // This allows UTF-8 characters usage in OSX.
 | 
				
			||||||
    setenv("LC_CTYPE", "UTF-8", 1);
 | 
					    setenv("LC_CTYPE", "UTF-8", 1);
 | 
				
			||||||
 | 
					 | 
				
			||||||
    // Force fusion style on macOS
 | 
					 | 
				
			||||||
    QQuickStyle::setStyle("Fusion");
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Force fusion style on every platform
 | 
				
			||||||
 | 
					    QQuickStyle::setStyle("Fusion");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
 | 
					    if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
 | 
				
			||||||
        QTextStream cout(stdout, QIODevice::WriteOnly);
 | 
					        QTextStream cout(stdout, QIODevice::WriteOnly);
 | 
				
			||||||
        cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
 | 
					        cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << endl;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,14 +27,17 @@ import QtQuick.Dialogs 1.1
 | 
				
			|||||||
Window {
 | 
					Window {
 | 
				
			||||||
    id: settings_window
 | 
					    id: settings_window
 | 
				
			||||||
    title: qsTr("Settings")
 | 
					    title: qsTr("Settings")
 | 
				
			||||||
    width: 800
 | 
					    width: 600
 | 
				
			||||||
    height: 600
 | 
					    height: 480
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    property int tabmargins: 15
 | 
					    property int tabmargins: 15
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Item {
 | 
				
			||||||
 | 
					        anchors { fill: parent;  margins: tabmargins }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        TabBar {
 | 
					        TabBar {
 | 
				
			||||||
            id: bar
 | 
					            id: bar
 | 
				
			||||||
        anchors { left: parent.left; right: parent.right; top: parent.top }
 | 
					            anchors { left: parent.left; right: parent.right; top: parent.top; }
 | 
				
			||||||
            TabButton {
 | 
					            TabButton {
 | 
				
			||||||
                text: qsTr("General")
 | 
					                text: qsTr("General")
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
@@ -49,15 +52,17 @@ Window {
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    StackLayout {
 | 
					        Frame {
 | 
				
			||||||
            anchors {
 | 
					            anchors {
 | 
				
			||||||
                top: bar.bottom
 | 
					                top: bar.bottom
 | 
				
			||||||
                left: parent.left
 | 
					                left: parent.left
 | 
				
			||||||
                right: parent.right
 | 
					                right: parent.right
 | 
				
			||||||
                bottom: parent.bottom
 | 
					                bottom: parent.bottom
 | 
				
			||||||
            margins: tabmargins
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            StackLayout {
 | 
				
			||||||
 | 
					                anchors.fill: parent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                currentIndex: bar.currentIndex
 | 
					                currentIndex: bar.currentIndex
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                SettingsGeneralTab { }
 | 
					                SettingsGeneralTab { }
 | 
				
			||||||
@@ -66,3 +71,5 @@ Window {
 | 
				
			|||||||
                SettingsAdvancedTab { }
 | 
					                SettingsAdvancedTab { }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
 Submodule qmltermwidget updated: 997bdaa832...e9ea684734
									
								
							
		Reference in New Issue
	
	Block a user