History

load NodeList and Profile settings with menu settings load

Stephen Birarda committed 13 years ago

Commit f7a0dd51 parent d3b95d12 files · +4 −16Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+2−10
@@ -182,13 +182,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 181 unmodified lines
182 182
183 _settings = new QSettings(this);183 _settings = new QSettings(this);
184 184
185 // load user profile data185 // call Menu getInstance static method to set up the menu
186 _profile.loadData(_settings);186 _window->setMenuBar(Menu::getInstance());
187
188 // check if there is a saved domain server hostname
189 // this must be done now instead of with the other setting checks to allow manual override with
190 // --domain or --local options
191 NodeList::getInstance()->loadData(_settings);
192 187
193 // Check to see if the user passed in a command line option for loading a local188 // Check to see if the user passed in a command line option for loading a local
194 // Voxel File.189 // Voxel File.
@@ -210,9 +205,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 15 unmodified lines
210 NodeList::getInstance()->startSilentNodeRemovalThread();205 NodeList::getInstance()->startSilentNodeRemovalThread();
211 206
212 _window->setCentralWidget(_glWidget);207 _window->setCentralWidget(_glWidget);
213
214 // call Menu getInstance static method to set up the menu
215 _window->setMenuBar(Menu::getInstance());
216 208
217 _networkAccessManager = new QNetworkAccessManager(this);209 _networkAccessManager = new QNetworkAccessManager(this);
218 QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager);210 QNetworkDiskCache* cache = new QNetworkDiskCache(_networkAccessManager);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t