Merge pull request #4300 from gexgd0419/ui-tab-order

Set tab orders and buddies of UI controls
This commit is contained in:
DavidXanatos 2024-10-17 18:56:04 +02:00 committed by GitHub
commit 7f04373cac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 552 additions and 9 deletions

View File

@ -36,6 +36,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtRepeatPassword</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="2"> <item row="7" column="2">
@ -56,6 +59,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbCipher</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
@ -66,6 +72,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtNewPassword</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="9" column="2" colspan="3"> <item row="9" column="2" colspan="3">
@ -137,6 +146,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtPassword</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="8" column="2" colspan="3"> <item row="8" column="2" colspan="3">
@ -164,6 +176,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtImageSize</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="4" column="3">
@ -177,6 +192,16 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>txtPassword</tabstop>
<tabstop>txtNewPassword</tabstop>
<tabstop>txtRepeatPassword</tabstop>
<tabstop>chkShow</tabstop>
<tabstop>txtImageSize</tabstop>
<tabstop>cmbCipher</tabstop>
<tabstop>chkProtect</tabstop>
<tabstop>chkAutoLock</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -90,6 +90,12 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>cmbFormat</tabstop>
<tabstop>cmbCompression</tabstop>
<tabstop>chkSolid</tabstop>
<tabstop>chkEncrypt</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -21,6 +21,9 @@
<property name="text"> <property name="text">
<string>Box Root Folder</string> <string>Box Root Folder</string>
</property> </property>
<property name="buddy">
<cstring>cmbRoot</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
@ -45,6 +48,9 @@
<property name="text"> <property name="text">
<string>Import Sandbox Name</string> <string>Import Sandbox Name</string>
</property> </property>
<property name="buddy">
<cstring>txtName</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -88,6 +94,12 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>txtName</tabstop>
<tabstop>cmbRoot</tabstop>
<tabstop>btnRoot</tabstop>
<tabstop>chkNoCrypt</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -98,6 +98,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbBoxIndicator</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0" colspan="3">
@ -108,6 +111,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbBoxBorder</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="11" column="2" colspan="5"> <item row="11" column="2" colspan="5">
@ -219,6 +225,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbBoxType</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="7"> <item row="2" column="7">
@ -229,6 +238,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>spinBorderWidth</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
@ -267,6 +279,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbDblClick</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="3" colspan="4"> <item row="5" column="3" colspan="4">
@ -292,6 +307,9 @@
<property name="text"> <property name="text">
<string>Virtualization scheme</string> <string>Virtualization scheme</string>
</property> </property>
<property name="buddy">
<cstring>cmbVersion</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="8" column="2" colspan="3"> <item row="8" column="2" colspan="3">
@ -1649,6 +1667,9 @@
<property name="text"> <property name="text">
<string>Total Processes Number Limit:</string> <string>Total Processes Number Limit:</string>
</property> </property>
<property name="buddy">
<cstring>txtTotalNumber</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="3"> <item row="6" column="3">
@ -1703,6 +1724,9 @@
<property name="text"> <property name="text">
<string>Single Process Memory Limit:</string> <string>Single Process Memory Limit:</string>
</property> </property>
<property name="buddy">
<cstring>txtSingleMemory</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="5"> <item row="7" column="5">
@ -1746,6 +1770,9 @@
<property name="text"> <property name="text">
<string>Total Processes Memory Limit:</string> <string>Total Processes Memory Limit:</string>
</property> </property>
<property name="buddy">
<cstring>txtTotalMemory</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="5"> <item row="4" column="5">
@ -3442,6 +3469,9 @@ The process match level has a higher priority than the specificity and describes
<property name="text"> <property name="text">
<string>Set network/internet access for unlisted processes:</string> <string>Set network/internet access for unlisted processes:</string>
</property> </property>
<property name="buddy">
<cstring>cmbBlockINet</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -3489,6 +3519,9 @@ The process match level has a higher priority than the specificity and describes
<property name="text"> <property name="text">
<string>Test Rules, Program:</string> <string>Test Rules, Program:</string>
</property> </property>
<property name="buddy">
<cstring>txtProgFwTest</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -3499,6 +3532,9 @@ The process match level has a higher priority than the specificity and describes
<property name="text"> <property name="text">
<string>Port:</string> <string>Port:</string>
</property> </property>
<property name="buddy">
<cstring>txtPortFwTest</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -3509,6 +3545,9 @@ The process match level has a higher priority than the specificity and describes
<property name="text"> <property name="text">
<string>IP:</string> <string>IP:</string>
</property> </property>
<property name="buddy">
<cstring>txtIPFwTest</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -3519,6 +3558,9 @@ The process match level has a higher priority than the specificity and describes
<property name="text"> <property name="text">
<string>Protocol:</string> <string>Protocol:</string>
</property> </property>
<property name="buddy">
<cstring>cmbProtFwTest</cstring>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -5361,6 +5403,9 @@ instead of &quot;*&quot;.</string>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbCategories</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="4"> <item row="6" column="4">
@ -5429,6 +5474,9 @@ instead of &quot;*&quot;.</string>
<property name="text"> <property name="text">
<string>Text Filter</string> <string>Text Filter</string>
</property> </property>
<property name="buddy">
<cstring>txtTemplates</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
@ -5743,60 +5791,258 @@ Please note that this values are currently user specific and saved globally for
<tabstop>cmbBoxBorder</tabstop> <tabstop>cmbBoxBorder</tabstop>
<tabstop>btnBorderColor</tabstop> <tabstop>btnBorderColor</tabstop>
<tabstop>spinBorderWidth</tabstop> <tabstop>spinBorderWidth</tabstop>
<tabstop>treeRun</tabstop> <tabstop>chkShowForRun</tabstop>
<tabstop>btnAddCmd</tabstop> <tabstop>chkPinToTray</tabstop>
<tabstop>btnDelCmd</tabstop> <tabstop>cmbDblClick</tabstop>
<tabstop>cmbBoxType</tabstop>
<tabstop>cmbVersion</tabstop>
<tabstop>chkSeparateUserFolders</tabstop>
<tabstop>chkUseVolumeSerialNumbers</tabstop>
<tabstop>chkRamBox</tabstop>
<tabstop>chkEncrypt</tabstop>
<tabstop>btnPassword</tabstop>
<tabstop>chkForceProtection</tabstop>
<tabstop>chkAutoEmpty</tabstop> <tabstop>chkAutoEmpty</tabstop>
<tabstop>chkProtectBox</tabstop> <tabstop>chkProtectBox</tabstop>
<tabstop>treeTriggers</tabstop> <tabstop>chkRawDiskRead</tabstop>
<tabstop>btnDelAuto</tabstop> <tabstop>chkRawDiskNotify</tabstop>
<tabstop>chkCopyLimit</tabstop>
<tabstop>txtCopyLimit</tabstop>
<tabstop>chkCopyPrompt</tabstop>
<tabstop>chkNoCopyWarn</tabstop>
<tabstop>chkDenyWrite</tabstop>
<tabstop>treeCopy</tabstop>
<tabstop>btnAddCopy</tabstop>
<tabstop>chkShowCopyTmpl</tabstop>
<tabstop>btnDelCopy</tabstop>
<tabstop>chkNoCopyMsg</tabstop>
<tabstop>chkBlockSpooler</tabstop>
<tabstop>chkOpenSpooler</tabstop>
<tabstop>chkPrintToFile</tabstop>
<tabstop>chkOpenProtectedStorage</tabstop>
<tabstop>chkOpenCredentials</tabstop>
<tabstop>chkCloseClipBoard</tabstop>
<tabstop>chkVmRead</tabstop>
<tabstop>chkVmReadNotify</tabstop>
<tabstop>chkProtectPower</tabstop>
<tabstop>chkUserOperation</tabstop>
<tabstop>chkCoverBar</tabstop>
<tabstop>chkBlockCapture</tabstop>
<tabstop>chkOpenDevCMApi</tabstop>
<tabstop>chkOpenSamEndpoint</tabstop>
<tabstop>chkOpenLsaEndpoint</tabstop>
<tabstop>treeRun</tabstop>
<tabstop>btnAddCmd</tabstop>
<tabstop>btnCmdUp</tabstop>
<tabstop>btnCmdDown</tabstop>
<tabstop>btnDelCmd</tabstop>
<tabstop>tabsSecurity</tabstop>
<tabstop>chkSecurityMode</tabstop>
<tabstop>chkLockDown</tabstop>
<tabstop>chkRestrictDevices</tabstop>
<tabstop>chkDropRights</tabstop>
<tabstop>chkFakeElevation</tabstop>
<tabstop>chkMsiExemptions</tabstop>
<tabstop>chkNoSecurityIsolation</tabstop>
<tabstop>chkNoSecurityFiltering</tabstop>
<tabstop>chkConfidential</tabstop>
<tabstop>chkLessConfidential</tabstop>
<tabstop>chkProtectWindow</tabstop>
<tabstop>chkAdminOnly</tabstop>
<tabstop>treeHostProc</tabstop>
<tabstop>btnHostProcessAllow</tabstop>
<tabstop>btnHostProcessDeny</tabstop>
<tabstop>chkShowHostProcTmpl</tabstop>
<tabstop>btnDelHostProcess</tabstop>
<tabstop>chkNotifyProtect</tabstop>
<tabstop>chkAddToJob</tabstop>
<tabstop>chkNestedJobs</tabstop>
<tabstop>txtSingleMemory</tabstop>
<tabstop>txtTotalMemory</tabstop>
<tabstop>txtTotalNumber</tabstop>
<tabstop>chkProtectSCM</tabstop>
<tabstop>chkRestrictServices</tabstop>
<tabstop>chkElevateRpcss</tabstop>
<tabstop>chkProtectSystem</tabstop>
<tabstop>chkDropPrivileges</tabstop>
<tabstop>chkDropConHostIntegrity</tabstop>
<tabstop>chkSbieLogon</tabstop>
<tabstop>chkCreateToken</tabstop>
<tabstop>treeGroups</tabstop> <tabstop>treeGroups</tabstop>
<tabstop>btnAddGroup</tabstop> <tabstop>btnAddGroup</tabstop>
<tabstop>btnAddProg</tabstop> <tabstop>btnAddProg</tabstop>
<tabstop>chkShowGroupTmpl</tabstop>
<tabstop>btnDelProg</tabstop> <tabstop>btnDelProg</tabstop>
<tabstop>tabsForce</tabstop>
<tabstop>treeForced</tabstop>
<tabstop>btnForceProg</tabstop>
<tabstop>btnForceChild</tabstop>
<tabstop>btnForceDir</tabstop>
<tabstop>chkShowForceTmpl</tabstop>
<tabstop>btnDelForce</tabstop>
<tabstop>chkDisableForced</tabstop>
<tabstop>treeBreakout</tabstop>
<tabstop>btnBreakoutProg</tabstop>
<tabstop>btnBreakoutDir</tabstop>
<tabstop>chkShowBreakoutTmpl</tabstop>
<tabstop>btnDelBreakout</tabstop>
<tabstop>tabsStop</tabstop>
<tabstop>treeStop</tabstop> <tabstop>treeStop</tabstop>
<tabstop>btnAddLingering</tabstop> <tabstop>btnAddLingering</tabstop>
<tabstop>chkShowStopTmpl</tabstop> <tabstop>chkShowStopTmpl</tabstop>
<tabstop>btnDelStopProg</tabstop> <tabstop>btnDelStopProg</tabstop>
<tabstop>treeLeader</tabstop>
<tabstop>btnAddLeader</tabstop>
<tabstop>chkShowLeaderTmpl</tabstop>
<tabstop>btnDelLeader</tabstop>
<tabstop>chkNoStopWnd</tabstop>
<tabstop>chkLingerLeniency</tabstop>
<tabstop>radStartAll</tabstop> <tabstop>radStartAll</tabstop>
<tabstop>radStartExcept</tabstop> <tabstop>radStartExcept</tabstop>
<tabstop>radStartSelected</tabstop> <tabstop>radStartSelected</tabstop>
<tabstop>treeStart</tabstop> <tabstop>treeStart</tabstop>
<tabstop>btnAddStartProg</tabstop> <tabstop>btnAddStartProg</tabstop>
<tabstop>chkShowStartTmpl</tabstop>
<tabstop>btnDelStartProg</tabstop> <tabstop>btnDelStartProg</tabstop>
<tabstop>chkStartBlockMsg</tabstop> <tabstop>chkStartBlockMsg</tabstop>
<tabstop>chkAlertBeforeStart</tabstop>
<tabstop>tabsAccess</tabstop>
<tabstop>treeFiles</tabstop>
<tabstop>btnAddFile</tabstop>
<tabstop>chkShowFilesTmpl</tabstop>
<tabstop>btnDelFile</tabstop>
<tabstop>treeKeys</tabstop>
<tabstop>btnAddKey</tabstop>
<tabstop>chkShowKeysTmpl</tabstop>
<tabstop>btnDelKey</tabstop>
<tabstop>treeIPC</tabstop>
<tabstop>btnAddIPC</tabstop>
<tabstop>chkShowIPCTmpl</tabstop>
<tabstop>btnDelIPC</tabstop>
<tabstop>treeWnd</tabstop>
<tabstop>btnAddWnd</tabstop>
<tabstop>chkShowWndTmpl</tabstop>
<tabstop>btnDelWnd</tabstop>
<tabstop>chkNoWindowRename</tabstop>
<tabstop>treeCOM</tabstop>
<tabstop>btnAddCOM</tabstop>
<tabstop>chkShowCOMTmpl</tabstop>
<tabstop>btnDelCOM</tabstop>
<tabstop>chkOpenCOM</tabstop>
<tabstop>chkPrivacy</tabstop>
<tabstop>chkUseSpecificity</tabstop>
<tabstop>chkCloseForBox</tabstop>
<tabstop>chkNoOpenForBox</tabstop>
<tabstop>tabsInternet</tabstop>
<tabstop>cmbBlockINet</tabstop>
<tabstop>chkINetBlockPrompt</tabstop> <tabstop>chkINetBlockPrompt</tabstop>
<tabstop>treeINet</tabstop> <tabstop>treeINet</tabstop>
<tabstop>btnAddINetProg</tabstop> <tabstop>btnAddINetProg</tabstop>
<tabstop>btnDelINetProg</tabstop> <tabstop>btnDelINetProg</tabstop>
<tabstop>chkINetBlockMsg</tabstop> <tabstop>chkINetBlockMsg</tabstop>
<tabstop>treeNetFw</tabstop>
<tabstop>btnAddFwRule</tabstop>
<tabstop>chkShowNetFwTmpl</tabstop>
<tabstop>btnDelFwRule</tabstop>
<tabstop>txtProgFwTest</tabstop>
<tabstop>txtPortFwTest</tabstop>
<tabstop>txtIPFwTest</tabstop>
<tabstop>cmbProtFwTest</tabstop>
<tabstop>btnClearFwTest</tabstop>
<tabstop>treeDns</tabstop>
<tabstop>btnAddDns</tabstop>
<tabstop>btnDelDns</tabstop>
<tabstop>treeProxy</tabstop>
<tabstop>btnAddProxy</tabstop>
<tabstop>btnTestProxy</tabstop>
<tabstop>btnMoveProxyUp</tabstop>
<tabstop>btnMoveProxyDown</tabstop>
<tabstop>chkProxyResolveHostnames</tabstop>
<tabstop>btnDelProxy</tabstop>
<tabstop>chkBlockSamba</tabstop>
<tabstop>chkBlockDns</tabstop>
<tabstop>chkBlockNetShare</tabstop>
<tabstop>chkBlockNetParam</tabstop>
<tabstop>tabsRecovery</tabstop>
<tabstop>treeRecovery</tabstop> <tabstop>treeRecovery</tabstop>
<tabstop>btnAddRecovery</tabstop> <tabstop>btnAddRecovery</tabstop>
<tabstop>chkShowRecoveryTmpl</tabstop> <tabstop>chkShowRecoveryTmpl</tabstop>
<tabstop>btnDelRecovery</tabstop> <tabstop>btnDelRecovery</tabstop>
<tabstop>chkAutoRecovery</tabstop>
<tabstop>treeRecIgnore</tabstop>
<tabstop>btnAddRecIgnore</tabstop>
<tabstop>btnAddRecIgnoreExt</tabstop>
<tabstop>chkShowRecIgnoreTmpl</tabstop>
<tabstop>btnDelRecIgnore</tabstop>
<tabstop>tabsOther</tabstop>
<tabstop>chkNoPanic</tabstop>
<tabstop>chkPreferExternalManifest</tabstop>
<tabstop>chkElevateCreateProcessFix</tabstop>
<tabstop>chkUseSbieDeskHack</tabstop>
<tabstop>chkUseSbieWndStation</tabstop>
<tabstop>chkComTimeout</tabstop>
<tabstop>chkForceRestart</tabstop>
<tabstop>treeInjectDll</tabstop>
<tabstop>chkHostProtect</tabstop>
<tabstop>chkHostProtectMsg</tabstop>
<tabstop>tabsAdvanced</tabstop> <tabstop>tabsAdvanced</tabstop>
<tabstop>treeOptions</tabstop>
<tabstop>btnAddOption</tabstop>
<tabstop>chkShowOptionsTmpl</tabstop>
<tabstop>btnDelOption</tabstop>
<tabstop>treeTriggers</tabstop>
<tabstop>btnAddAutoExec</tabstop>
<tabstop>btnAddAutoRun</tabstop>
<tabstop>btnAddAutoSvc</tabstop>
<tabstop>btnAddTerminateCmd</tabstop>
<tabstop>btnAddRecoveryCmd</tabstop>
<tabstop>btnAddDeleteCmd</tabstop>
<tabstop>chkShowTriggersTmpl</tabstop>
<tabstop>btnDelAuto</tabstop>
<tabstop>chkHideFirmware</tabstop>
<tabstop>btnDumpFW</tabstop>
<tabstop>cmbLangID</tabstop>
<tabstop>chkHideSerial</tabstop>
<tabstop>chkHideMac</tabstop>
<tabstop>chkHideUID</tabstop>
<tabstop>chkHideOtherBoxes</tabstop> <tabstop>chkHideOtherBoxes</tabstop>
<tabstop>chkHideNonSystemProcesses</tabstop>
<tabstop>treeHideProc</tabstop>
<tabstop>btnAddProcess</tabstop> <tabstop>btnAddProcess</tabstop>
<tabstop>chkShowHiddenProcTmpl</tabstop>
<tabstop>btnDelProcess</tabstop> <tabstop>btnDelProcess</tabstop>
<tabstop>chkBlockWMI</tabstop>
<tabstop>lstUsers</tabstop> <tabstop>lstUsers</tabstop>
<tabstop>btnAddUser</tabstop> <tabstop>btnAddUser</tabstop>
<tabstop>btnDelUser</tabstop> <tabstop>btnDelUser</tabstop>
<tabstop>chkMonitorAdminOnly</tabstop> <tabstop>chkMonitorAdminOnly</tabstop>
<tabstop>chkDisableMonitor</tabstop>
<tabstop>chkCallTrace</tabstop>
<tabstop>chkFileTrace</tabstop> <tabstop>chkFileTrace</tabstop>
<tabstop>chkPipeTrace</tabstop> <tabstop>chkPipeTrace</tabstop>
<tabstop>chkKeyTrace</tabstop> <tabstop>chkKeyTrace</tabstop>
<tabstop>chkIpcTrace</tabstop> <tabstop>chkIpcTrace</tabstop>
<tabstop>chkGuiTrace</tabstop> <tabstop>chkGuiTrace</tabstop>
<tabstop>chkComTrace</tabstop> <tabstop>chkComTrace</tabstop>
<tabstop>chkNetFwTrace</tabstop>
<tabstop>chkDnsTrace</tabstop>
<tabstop>chkHookTrace</tabstop>
<tabstop>chkDbgTrace</tabstop> <tabstop>chkDbgTrace</tabstop>
<tabstop>chkErrTrace</tabstop>
<tabstop>scrollArea</tabstop> <tabstop>scrollArea</tabstop>
<tabstop>treeTemplates</tabstop> <tabstop>tabsTemplates</tabstop>
<tabstop>cmbCategories</tabstop> <tabstop>cmbCategories</tabstop>
<tabstop>txtTemplates</tabstop> <tabstop>txtTemplates</tabstop>
<tabstop>treeTemplates</tabstop>
<tabstop>btnAddTemplate</tabstop>
<tabstop>btnOpenTemplate</tabstop>
<tabstop>btnDelTemplate</tabstop>
<tabstop>treeFolders</tabstop>
<tabstop>chkScreenReaders</tabstop>
<tabstop>btnEditIni</tabstop> <tabstop>btnEditIni</tabstop>
<tabstop>txtIniSection</tabstop>
<tabstop>btnSaveIni</tabstop> <tabstop>btnSaveIni</tabstop>
<tabstop>btnCancelEdit</tabstop> <tabstop>btnCancelEdit</tabstop>
<tabstop>txtIniSection</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -70,6 +70,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbRecover</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
@ -193,6 +196,14 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>treeFiles</tabstop> <tabstop>treeFiles</tabstop>
<tabstop>btnDelete</tabstop>
<tabstop>cmbRecover</tabstop>
<tabstop>btnRecover</tabstop>
<tabstop>btnRefresh</tabstop>
<tabstop>btnAddFolder</tabstop>
<tabstop>chkShowAll</tabstop>
<tabstop>btnDeleteAll</tabstop>
<tabstop>btnClose</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -111,6 +111,14 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>radBoxed</tabstop>
<tabstop>treeBoxes</tabstop>
<tabstop>radBoxedNew</tabstop>
<tabstop>radUnBoxed</tabstop>
<tabstop>chkFCP</tabstop>
<tabstop>chkAdmin</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

View File

@ -87,6 +87,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>uiLang</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
@ -597,6 +600,9 @@
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>cmbIntegrateMenu</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="11" column="2"> <item row="11" column="2">
@ -613,6 +619,9 @@
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>cmbIntegrateDesk</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="12" column="2"> <item row="12" column="2">
@ -678,6 +687,9 @@
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>cmbTrayBoxes</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -691,6 +703,9 @@
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>cmbSysTray</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
@ -764,6 +779,9 @@
<property name="text"> <property name="text">
<string>On main window close:</string> <string>On main window close:</string>
</property> </property>
<property name="buddy">
<cstring>cmbOnClose</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="1" colspan="2"> <item row="5" column="1" colspan="2">
@ -1113,6 +1131,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbDPI</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="2" column="3">
@ -1130,6 +1151,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtEditor</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
@ -1263,6 +1287,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbFontScale</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
@ -1509,6 +1536,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>txtRamLimit</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="6"> <item row="4" column="6">
@ -1835,6 +1865,9 @@
<property name="text"> <property name="text">
<string>Incremental Updates</string> <string>Incremental Updates</string>
</property> </property>
<property name="buddy">
<cstring>cmbUpdate</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="2" colspan="2"> <item row="5" column="2" colspan="2">
@ -1889,6 +1922,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="text"> <property name="text">
<string>Full Upgrades</string> <string>Full Upgrades</string>
</property> </property>
<property name="buddy">
<cstring>cmbRelease</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3"> <item row="2" column="1" colspan="3">
@ -1962,6 +1998,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="text"> <property name="text">
<string>Update Check Interval</string> <string>Update Check Interval</string>
</property> </property>
<property name="buddy">
<cstring>cmbInterval</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="4" colspan="3"> <item row="7" column="4" colspan="3">
@ -2040,6 +2079,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>regRoot</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
@ -2077,6 +2119,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>fileRoot</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="2">
@ -2100,6 +2145,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbDefault</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="7" column="1" colspan="6"> <item row="7" column="1" colspan="6">
@ -2175,6 +2223,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="buddy">
<cstring>ipcRoot</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="11" column="1">
@ -2467,6 +2518,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy">
<cstring>cmbUsbSandbox</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -2623,6 +2677,9 @@ Unlike the preview channel, it does not include untested, potentially breaking,
<property name="text"> <property name="text">
<string>Text Filter</string> <string>Text Filter</string>
</property> </property>
<property name="buddy">
<cstring>txtTemplates</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
@ -2795,20 +2852,137 @@ Unlike the preview channel, it does not include untested, potentially breaking,
</widget> </widget>
<tabstops> <tabstops>
<tabstop>tabs</tabstop> <tabstop>tabs</tabstop>
<tabstop>tabsGeneral</tabstop>
<tabstop>uiLang</tabstop>
<tabstop>chkSandboxUrls</tabstop> <tabstop>chkSandboxUrls</tabstop>
<tabstop>chkMonitorSize</tabstop>
<tabstop>chkPanic</tabstop>
<tabstop>keyPanic</tabstop>
<tabstop>chkTop</tabstop>
<tabstop>keyTop</tabstop>
<tabstop>chkPauseForce</tabstop>
<tabstop>keyPauseForce</tabstop>
<tabstop>chkSuspend</tabstop>
<tabstop>keySuspend</tabstop>
<tabstop>chkAsyncBoxOps</tabstop>
<tabstop>chkAutoTerminate</tabstop>
<tabstop>chkShowRecovery</tabstop>
<tabstop>chkCheckDelete</tabstop>
<tabstop>chkRecoveryTop</tabstop>
<tabstop>chkSilentMode</tabstop>
<tabstop>chkCopyProgress</tabstop>
<tabstop>chkNotifyRecovery</tabstop>
<tabstop>chkNoMessages</tabstop>
<tabstop>treeMessages</tabstop>
<tabstop>btnAddMessage</tabstop>
<tabstop>btnDelMessage</tabstop>
<tabstop>tabsShell</tabstop>
<tabstop>chkAutoStart</tabstop>
<tabstop>chkSvcStart</tabstop>
<tabstop>chkShellMenu</tabstop>
<tabstop>chkAlwaysDefault</tabstop>
<tabstop>chkShellMenu2</tabstop>
<tabstop>chkShellMenu3</tabstop>
<tabstop>chkShellMenu4</tabstop>
<tabstop>chkScanMenu</tabstop>
<tabstop>cmbIntegrateMenu</tabstop>
<tabstop>cmbIntegrateDesk</tabstop>
<tabstop>cmbSysTray</tabstop>
<tabstop>cmbTrayBoxes</tabstop>
<tabstop>chkCompactTray</tabstop>
<tabstop>chkBoxOpsNotify</tabstop>
<tabstop>cmbOnClose</tabstop>
<tabstop>chkMinimize</tabstop>
<tabstop>chkSingleShow</tabstop>
<tabstop>treeRun</tabstop>
<tabstop>btnAddCmd</tabstop>
<tabstop>btnCmdUp</tabstop>
<tabstop>btnCmdDown</tabstop>
<tabstop>btnDelCmd</tabstop>
<tabstop>tabsGUI</tabstop>
<tabstop>chkDarkTheme</tabstop>
<tabstop>chkFusionTheme</tabstop>
<tabstop>chkAltRows</tabstop>
<tabstop>chkBackground</tabstop>
<tabstop>chkLargeIcons</tabstop>
<tabstop>chkNoIcons</tabstop>
<tabstop>chkOptTree</tabstop>
<tabstop>chkNewLayout</tabstop>
<tabstop>chkColorIcons</tabstop>
<tabstop>chkOverlayIcons</tabstop>
<tabstop>chkHideCore</tabstop>
<tabstop>cmbDPI</tabstop>
<tabstop>cmbFontScale</tabstop>
<tabstop>chkHide</tabstop>
<tabstop>btnSelectIniFont</tabstop>
<tabstop>btnResetIniFont</tabstop>
<tabstop>txtEditor</tabstop>
<tabstop>tabsAddons</tabstop>
<tabstop>treeAddons</tabstop>
<tabstop>btnInstallAddon</tabstop>
<tabstop>btnRemoveAddon</tabstop>
<tabstop>chkRamDisk</tabstop>
<tabstop>txtRamLimit</tabstop>
<tabstop>chkRamLetter</tabstop>
<tabstop>cmbRamLetter</tabstop>
<tabstop>tabsSupport</tabstop>
<tabstop>txtCertificate</tabstop>
<tabstop>txtSerial</tabstop>
<tabstop>btnGetCert</tabstop>
<tabstop>chkNoCheck</tabstop>
<tabstop>chkAutoUpdate</tabstop>
<tabstop>cmbInterval</tabstop>
<tabstop>radStable</tabstop>
<tabstop>radPreview</tabstop>
<tabstop>radInsider</tabstop>
<tabstop>cmbUpdate</tabstop>
<tabstop>cmbRelease</tabstop>
<tabstop>chkUpdateIssues</tabstop>
<tabstop>chkUpdateAddons</tabstop>
<tabstop>tabsAdvanced</tabstop>
<tabstop>cmbDefault</tabstop>
<tabstop>chkAutoRoot</tabstop>
<tabstop>fileRoot</tabstop> <tabstop>fileRoot</tabstop>
<tabstop>btnBrowse</tabstop> <tabstop>btnBrowse</tabstop>
<tabstop>regRoot</tabstop> <tabstop>regRoot</tabstop>
<tabstop>ipcRoot</tabstop> <tabstop>ipcRoot</tabstop>
<tabstop>chkWFP</tabstop>
<tabstop>chkObjCb</tabstop>
<tabstop>chkWin32k</tabstop>
<tabstop>chkSbieLogon</tabstop>
<tabstop>chkSbieAll</tabstop>
<tabstop>chkWatchConfig</tabstop>
<tabstop>chkSkipUAC</tabstop>
<tabstop>chkAdminOnly</tabstop>
<tabstop>chkPassRequired</tabstop>
<tabstop>btnSetPassword</tabstop>
<tabstop>chkAdminOnlyFP</tabstop>
<tabstop>chkClearPass</tabstop>
<tabstop>tabsControl</tabstop>
<tabstop>chkStartBlock</tabstop> <tabstop>chkStartBlock</tabstop>
<tabstop>treeWarnProgs</tabstop> <tabstop>treeWarnProgs</tabstop>
<tabstop>btnAddWarnProg</tabstop> <tabstop>btnAddWarnProg</tabstop>
<tabstop>btnAddWarnFolder</tabstop> <tabstop>btnAddWarnFolder</tabstop>
<tabstop>btnDelWarnProg</tabstop> <tabstop>btnDelWarnProg</tabstop>
<tabstop>chkStartBlockMsg</tabstop>
<tabstop>chkNotForcedMsg</tabstop>
<tabstop>chkSandboxUsb</tabstop>
<tabstop>cmbUsbSandbox</tabstop>
<tabstop>treeVolumes</tabstop>
<tabstop>tabsTemplates</tabstop>
<tabstop>treeCompat</tabstop> <tabstop>treeCompat</tabstop>
<tabstop>btnAddCompat</tabstop> <tabstop>btnAddCompat</tabstop>
<tabstop>btnDelCompat</tabstop> <tabstop>btnDelCompat</tabstop>
<tabstop>chkNoCompat</tabstop> <tabstop>chkNoCompat</tabstop>
<tabstop>txtTemplates</tabstop>
<tabstop>treeTemplates</tabstop>
<tabstop>btnAddTemplate</tabstop>
<tabstop>btnOpenTemplate</tabstop>
<tabstop>btnDelTemplate</tabstop>
<tabstop>btnEditIni</tabstop>
<tabstop>btnSaveIni</tabstop>
<tabstop>btnCancelEdit</tabstop>
<tabstop>txtIniSection</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../Resources/SandMan.qrc"/> <include location="../Resources/SandMan.qrc"/>

View File

@ -65,6 +65,9 @@
<property name="text"> <property name="text">
<string>Name:</string> <string>Name:</string>
</property> </property>
<property name="buddy">
<cstring>txtName</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -122,6 +125,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="buddy">
<cstring>txtInfo</cstring>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -222,11 +228,13 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>btnTake</tabstop>
<tabstop>treeSnapshots</tabstop> <tabstop>treeSnapshots</tabstop>
<tabstop>btnRemove</tabstop>
<tabstop>txtName</tabstop> <tabstop>txtName</tabstop>
<tabstop>chkDefault</tabstop>
<tabstop>txtInfo</tabstop> <tabstop>txtInfo</tabstop>
<tabstop>btnTake</tabstop>
<tabstop>btnSelect</tabstop>
<tabstop>btnRemove</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

View File

@ -10,6 +10,55 @@
#include "../Wizards/TemplateWizard.h" #include "../Wizards/TemplateWizard.h"
static bool IsAncestorOf(QObject* container, QObject* obj)
{
while (obj)
{
if (obj == container)
return true;
obj = obj->parent();
}
return false;
}
static QWidgetList GetTabOrder(QObject* container)
{
QWidgetList list;
QWidget* pWidget = container->findChild<QWidget*>();
if (!pWidget)
return list;
list.append(pWidget);
for (QWidget* pPrev = pWidget->previousInFocusChain();
pPrev && IsAncestorOf(container, pPrev);
pPrev = pPrev->previousInFocusChain())
{
list.prepend(pPrev);
}
for (QWidget* pNext = pWidget->nextInFocusChain();
pNext && IsAncestorOf(container, pNext);
pNext = pNext->nextInFocusChain())
{
list.append(pNext);
}
return list;
}
static void RestoreTabOrder(const QWidgetList& list)
{
QWidget* pPrev = nullptr;
for (QWidget* pWidget : list)
{
if (pPrev)
QWidget::setTabOrder(pPrev, pWidget);
pPrev = pWidget;
}
}
class NoEditDelegate : public QStyledItemDelegate { class NoEditDelegate : public QStyledItemDelegate {
public: public:
NoEditDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) {} NoEditDelegate(QObject* parent = 0) : QStyledItemDelegate(parent) {}
@ -275,12 +324,14 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
pDummy->setVisible(false); pDummy->setVisible(false);
// merge recovery tabs // merge recovery tabs
QWidgetList tabOrder = GetTabOrder(ui.tabsRecovery);
QWidget* pWidget3 = new QWidget(); QWidget* pWidget3 = new QWidget();
pWidget3->setLayout(ui.gridLayout_10); pWidget3->setLayout(ui.gridLayout_10);
ui.gridLayout_24->addWidget(pWidget3, 1, 0); ui.gridLayout_24->addWidget(pWidget3, 1, 0);
QWidget* pWidget4 = new QWidget(); QWidget* pWidget4 = new QWidget();
pWidget4->setLayout(ui.gridLayout_56); pWidget4->setLayout(ui.gridLayout_56);
ui.gridLayout_24->addWidget(pWidget4, 2, 0); ui.gridLayout_24->addWidget(pWidget4, 2, 0);
RestoreTabOrder(tabOrder);
delete ui.tabsRecovery; delete ui.tabsRecovery;
ui.gridLayout_24->setContentsMargins(0, 0, 0, 0); ui.gridLayout_24->setContentsMargins(0, 0, 0, 0);
@ -306,6 +357,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
if (iOptionLayout == 1) if (iOptionLayout == 1)
{ {
// merge stop tabs // merge stop tabs
tabOrder = GetTabOrder(ui.tabsStop);
QWidget* pWidget1 = new QWidget(); QWidget* pWidget1 = new QWidget();
pWidget1->setLayout(ui.gridLayout_57); pWidget1->setLayout(ui.gridLayout_57);
ui.gridLayout_17->addWidget(pWidget1, 1, 0); ui.gridLayout_17->addWidget(pWidget1, 1, 0);
@ -319,6 +371,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
ui.lblStopOpt->setVisible(false); ui.lblStopOpt->setVisible(false);
ui.lblStopOpt->setProperty("hidden", true); ui.lblStopOpt->setProperty("hidden", true);
ui.gridLayout_17->addWidget(pWidget3, 3, 0); ui.gridLayout_17->addWidget(pWidget3, 3, 0);
RestoreTabOrder(tabOrder);
delete ui.tabsStop; delete ui.tabsStop;
ui.gridLayout_17->setContentsMargins(0, 0, 0, 0); ui.gridLayout_17->setContentsMargins(0, 0, 0, 0);