Changeset 54880 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Mar 20, 2015 4:03:47 PM (10 years ago)
- svn:sync-xref-src-repo-rev:
- 99095
- Location:
- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
r54832 r54880 41 41 CGuestOSType UIMachineSettingsGeneral::guestOSType() const 42 42 { 43 AssertPtrReturn(m_pNameAndSystemEditor, CGuestOSType()); 43 44 return m_pNameAndSystemEditor->type(); 44 45 } … … 46 47 bool UIMachineSettingsGeneral::is64BitOSTypeSelected() const 47 48 { 49 AssertPtrReturn(m_pNameAndSystemEditor, false); 48 50 return m_pNameAndSystemEditor->type().GetIs64Bit(); 49 51 } … … 52 54 bool UIMachineSettingsGeneral::isWindowsOSTypeSelected() const 53 55 { 56 AssertPtrReturn(m_pNameAndSystemEditor, false); 54 57 return m_pNameAndSystemEditor->type().GetFamilyId() == "Windows"; 55 58 } … … 80 83 UIDataSettingsMachineGeneral generalData; 81 84 82 /* Gather generaldata: */85 /* 'Basic' tab data: */ 83 86 generalData.m_strName = m_machine.GetName(); 84 87 generalData.m_strGuestOsTypeId = m_machine.GetOSTypeId(); 88 89 /* 'Advanced' tab data: */ 85 90 generalData.m_strSnapshotsFolder = m_machine.GetSnapshotFolder(); 86 91 generalData.m_strSnapshotsHomeDir = QFileInfo(m_machine.GetSettingsFilePath()).absolutePath(); 87 92 generalData.m_clipboardMode = m_machine.GetClipboardMode(); 88 93 generalData.m_dndMode = m_machine.GetDnDMode(); 94 95 /* 'Description' tab data: */ 89 96 generalData.m_strDescription = m_machine.GetDescription(); 90 97 … … 101 108 const UIDataSettingsMachineGeneral &generalData = m_cache.base(); 102 109 103 /* Load general data to page: */ 110 /* 'Basic' tab data: */ 111 AssertPtrReturnVoid(m_pNameAndSystemEditor); 104 112 m_pNameAndSystemEditor->setName(generalData.m_strName); 105 113 m_pNameAndSystemEditor->setType(vboxGlobal().vmGuestOSType(generalData.m_strGuestOsTypeId)); 114 115 /* 'Advanced' tab data: */ 116 AssertPtrReturnVoid(mPsSnapshot); 117 AssertPtrReturnVoid(mCbClipboard); 118 AssertPtrReturnVoid(mCbDragAndDrop); 106 119 mPsSnapshot->setPath(generalData.m_strSnapshotsFolder); 107 120 mPsSnapshot->setHomeDir(generalData.m_strSnapshotsHomeDir); 108 121 mCbClipboard->setCurrentIndex(generalData.m_clipboardMode); 109 122 mCbDragAndDrop->setCurrentIndex(generalData.m_dndMode); 123 124 /* 'Description' tab data: */ 125 AssertPtrReturnVoid(mTeDescription); 110 126 mTeDescription->setPlainText(generalData.m_strDescription); 111 127 … … 122 138 UIDataSettingsMachineGeneral generalData = m_cache.base(); 123 139 124 /* Gather general data: */ 140 /* 'Basic' tab data: */ 141 AssertPtrReturnVoid(m_pNameAndSystemEditor); 125 142 generalData.m_strName = m_pNameAndSystemEditor->name(); 126 143 generalData.m_strGuestOsTypeId = m_pNameAndSystemEditor->type().GetId(); 144 145 /* 'Advanced' tab data: */ 146 AssertPtrReturnVoid(mPsSnapshot); 147 AssertPtrReturnVoid(mCbClipboard); 148 AssertPtrReturnVoid(mCbDragAndDrop); 127 149 generalData.m_strSnapshotsFolder = mPsSnapshot->path(); 128 150 generalData.m_clipboardMode = (KClipboardMode)mCbClipboard->currentIndex(); 129 151 generalData.m_dndMode = (KDnDMode)mCbDragAndDrop->currentIndex(); 152 153 /* 'Description' tab data: */ 154 AssertPtrReturnVoid(mTeDescription); 130 155 generalData.m_strDescription = mTeDescription->toPlainText().isEmpty() ? 131 156 QString::null : mTeDescription->toPlainText(); … … 146 171 const UIDataSettingsMachineGeneral &generalData = m_cache.data(); 147 172 148 /* Store general data: */149 173 if (isMachineInValidMode()) 150 174 { 151 /* Advanced tab: */ 152 m_machine.SetClipboardMode(generalData.m_clipboardMode); 153 m_machine.SetDnDMode(generalData.m_dndMode); 154 /* Description tab: */ 155 m_machine.SetDescription(generalData.m_strDescription); 175 /* 'Advanced' tab data: */ 176 if (generalData.m_clipboardMode != m_cache.base().m_clipboardMode) 177 m_machine.SetClipboardMode(generalData.m_clipboardMode); 178 if (generalData.m_dndMode != m_cache.base().m_dndMode) 179 m_machine.SetDnDMode(generalData.m_dndMode); 180 181 /* 'Description' tab: */ 182 if (generalData.m_strDescription != m_cache.base().m_strDescription) 183 m_machine.SetDescription(generalData.m_strDescription); 156 184 } 185 157 186 if (isMachineOffline()) 158 187 { 159 /* Basic tab: Must update long mode CPU feature bit when os type changes. */188 /* 'Basic' tab data: Must update long mode CPU feature bit when os type changes. */ 160 189 if (generalData.m_strGuestOsTypeId != m_cache.base().m_strGuestOsTypeId) 161 190 { … … 165 194 m_machine.SetCPUProperty(KCPUPropertyType_LongMode, newType.GetIs64Bit()); 166 195 } 167 /* Advanced tab: */ 168 m_machine.SetSnapshotFolder(generalData.m_strSnapshotsFolder); 169 /* Basic (again) tab: */ 170 /* VM name must be last as otherwise its VM rename magic can collide with other settings in the config, 196 197 /* 'Advanced' tab data: */ 198 if (generalData.m_strSnapshotsFolder != m_cache.base().m_strSnapshotsFolder) 199 m_machine.SetSnapshotFolder(generalData.m_strSnapshotsFolder); 200 201 /* 'Basic' (again) tab data: */ 202 /* VM name must be last as otherwise its VM rename magic 203 * can collide with other settings in the config, 171 204 * especially with the snapshot folder: */ 172 m_machine.SetName(generalData.m_strName); 205 if (generalData.m_strName != m_cache.base().m_strName) 206 m_machine.SetName(generalData.m_strName); 173 207 } 174 208 } … … 212 246 void UIMachineSettingsGeneral::setOrderAfter(QWidget *pWidget) 213 247 { 214 /* Basic tab-order: */ 248 /* 'Basic' tab: */ 249 AssertPtrReturnVoid(pWidget); 250 AssertPtrReturnVoid(mTwGeneral); 251 AssertPtrReturnVoid(mTwGeneral->focusProxy()); 252 AssertPtrReturnVoid(m_pNameAndSystemEditor); 215 253 setTabOrder(pWidget, mTwGeneral->focusProxy()); 216 254 setTabOrder(mTwGeneral->focusProxy(), m_pNameAndSystemEditor); 217 255 218 /* Advanced tab-order: */ 256 /* 'Advanced' tab: */ 257 AssertPtrReturnVoid(mPsSnapshot); 258 AssertPtrReturnVoid(mCbClipboard); 259 AssertPtrReturnVoid(mCbDragAndDrop); 219 260 setTabOrder(m_pNameAndSystemEditor, mPsSnapshot); 220 261 setTabOrder(mPsSnapshot, mCbClipboard); 221 262 setTabOrder(mCbClipboard, mCbDragAndDrop); 222 263 223 /* Description tab-order: */ 264 /* 'Description' tab: */ 265 AssertPtrReturnVoid(mTeDescription); 224 266 setTabOrder(mCbDragAndDrop, mTeDescription); 225 267 } … … 231 273 232 274 /* Translate path selector: */ 275 AssertPtrReturnVoid(mPsSnapshot); 233 276 mPsSnapshot->setWhatsThis(tr("Holds the path where snapshots of this " 234 277 "virtual machine will be stored. Be aware that " 235 278 "snapshots can take quite a lot of disk space.")); 236 279 /* Translate Shared Clipboard mode combo: */ 280 AssertPtrReturnVoid(mCbClipboard); 237 281 mCbClipboard->setItemText(0, gpConverter->toString(KClipboardMode_Disabled)); 238 282 mCbClipboard->setItemText(1, gpConverter->toString(KClipboardMode_HostToGuest)); … … 240 284 mCbClipboard->setItemText(3, gpConverter->toString(KClipboardMode_Bidirectional)); 241 285 /* Translate Drag'n'drop mode combo: */ 286 AssertPtrReturnVoid(mCbDragAndDrop); 242 287 mCbDragAndDrop->setItemText(0, gpConverter->toString(KDnDMode_Disabled)); 243 288 mCbDragAndDrop->setItemText(1, gpConverter->toString(KDnDMode_HostToGuest)); … … 251 296 Ui::UIMachineSettingsGeneral::setupUi(this); 252 297 253 /* Prepare pages: */254 prepare PageBasic();255 prepare PageAdvanced();256 prepare PageDescription();257 } 258 259 void UIMachineSettingsGeneral::prepare PageBasic()298 /* Prepare tabs: */ 299 prepareTabBasic(); 300 prepareTabAdvanced(); 301 prepareTabDescription(); 302 } 303 304 void UIMachineSettingsGeneral::prepareTabBasic() 260 305 { 261 306 /* Name and OS Type widget was created in the .ui file: */ … … 269 314 } 270 315 271 void UIMachineSettingsGeneral::prepare PageAdvanced()316 void UIMachineSettingsGeneral::prepareTabAdvanced() 272 317 { 273 318 /* Shared Clipboard mode combo was created in the .ui file: */ … … 275 320 { 276 321 /* Configure Shared Clipboard mode combo: */ 277 mCbClipboard->addItem 278 mCbClipboard->addItem 279 mCbClipboard->addItem 280 mCbClipboard->addItem 322 mCbClipboard->addItem(""); /* KClipboardMode_Disabled */ 323 mCbClipboard->addItem(""); /* KClipboardMode_HostToGuest */ 324 mCbClipboard->addItem(""); /* KClipboardMode_GuestToHost */ 325 mCbClipboard->addItem(""); /* KClipboardMode_Bidirectional */ 281 326 } 282 327 /* Drag&drop mode combo was created in the .ui file: */ … … 284 329 { 285 330 /* Configure Drag&drop mode combo: */ 286 mCbDragAndDrop->addItem 287 mCbDragAndDrop->addItem 288 mCbDragAndDrop->addItem 289 mCbDragAndDrop->addItem 290 } 291 } 292 293 void UIMachineSettingsGeneral::prepare PageDescription()331 mCbDragAndDrop->addItem(""); /* KDnDMode_Disabled */ 332 mCbDragAndDrop->addItem(""); /* KDnDMode_HostToGuest */ 333 mCbDragAndDrop->addItem(""); /* KDnDMode_GuestToHost */ 334 mCbDragAndDrop->addItem(""); /* KDnDMode_Bidirectional */ 335 } 336 } 337 338 void UIMachineSettingsGeneral::prepareTabDescription() 294 339 { 295 340 /* Description text editor was created in the .ui file: */ … … 305 350 void UIMachineSettingsGeneral::polishPage() 306 351 { 307 /* Basic tab: */ 352 /* 'Basic' tab: */ 353 AssertPtrReturnVoid(m_pNameAndSystemEditor); 308 354 m_pNameAndSystemEditor->setEnabled(isMachineOffline()); 309 /* Advanced tab: */ 355 356 /* 'Advanced' tab: */ 357 AssertPtrReturnVoid(mLbSnapshot); 358 AssertPtrReturnVoid(mPsSnapshot); 359 AssertPtrReturnVoid(mLbClipboard); 360 AssertPtrReturnVoid(mCbClipboard); 361 AssertPtrReturnVoid(mLbDragAndDrop); 362 AssertPtrReturnVoid(mCbDragAndDrop); 310 363 mLbSnapshot->setEnabled(isMachineOffline()); 311 364 mPsSnapshot->setEnabled(isMachineOffline()); … … 314 367 mLbDragAndDrop->setEnabled(isMachineInValidMode()); 315 368 mCbDragAndDrop->setEnabled(isMachineInValidMode()); 316 } 317 369 370 /* 'Description' tab: */ 371 AssertPtrReturnVoid(mTeDescription); 372 mTeDescription->setEnabled(isMachineInValidMode()); 373 } 374 -
trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.h
r54857 r54880 33 33 , m_clipboardMode(KClipboardMode_Disabled) 34 34 , m_dndMode(KDnDMode_Disabled) 35 , m_strDescription(QString()) {} 35 , m_strDescription(QString()) 36 {} 36 37 37 38 /** Returns whether passed @a other is equal to this. */ … … 61 62 /** Holds the default VM snapshot folder. */ 62 63 QString m_strSnapshotsHomeDir; 63 64 64 /** Holds the VM shared clipboard mode. */ 65 65 KClipboardMode m_clipboardMode; … … 127 127 /** Prepare routine. */ 128 128 void prepare(); 129 /** Prepare 'Basic' pageroutine. */130 void prepare PageBasic();131 /** Prepare 'Advanced' pageroutine. */132 void prepare PageAdvanced();133 /** Prepare 'Description' pageroutine. */134 void prepare PageDescription();129 /** Prepare 'Basic' tab routine. */ 130 void prepareTabBasic(); 131 /** Prepare 'Advanced' tab routine. */ 132 void prepareTabAdvanced(); 133 /** Prepare 'Description' tab routine. */ 134 void prepareTabDescription(); 135 135 136 136 /** Polish routine. */
Note:
See TracChangeset
for help on using the changeset viewer.