History

Merge branch 'master' of https://github.com/highfidelity/hifi

Andrzej Kapolka committed 12 years ago

Commit 95e59d72 parents 5f6f4b3 89a6ecd14 files · +253 −254Browse files

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

Unified · Split

interface/src/Application.cpp+14−2
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 #include <QColorDialog>
2828 #include <QDesktopWidget>
2929 #include <QCheckBox>
30+#include <QHBoxLayout>
3031 #include <QImage>
3132 #include <QKeyEvent>
3233 #include <QMainWindow>
@@ -62,6 +63,7 @@ · 29 unmodified lines
6263 #include <UUID.h>
6364 #include <OctreeSceneStats.h>
6465 #include <LocalVoxelsList.h>
66+#include <FstReader.h>
6567
6668 #include "Application.h"
6769 #include "ClipboardScriptingInterface.h"
@@ -290,7 +292,14 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 222 unmodified lines
290292 ResourceCache::setNetworkAccessManager(_networkAccessManager);
291293 ResourceCache::setRequestLimit(3);
292294
293− _window->setCentralWidget(_glWidget);
295+ QWidget* centralWidget = new QWidget();
296+ QHBoxLayout* mainLayout = new QHBoxLayout();
297+ mainLayout->setSpacing(0);
298+ mainLayout->setContentsMargins(0, 0, 0, 0);
299+ centralWidget->setLayout(mainLayout);
300+ _glWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
301+ centralWidget->layout()->addWidget(_glWidget);
302+ _window->setCentralWidget(centralWidget);
294303
295304 restoreSizeAndPosition();
296305
@@ -3464,7 +3473,10 @@ void Application::reloadAllScripts() { · 3167 unmodified lines
34643473 }
34653474
34663475 void Application::uploadFST() {
3467− _fstReader.zip();
3476+ FstReader reader;
3477+ if (reader.zip()) {
3478+ reader.send();
3479+ }
34683480 }
34693481
34703482 void Application::removeScriptName(const QString& fileNameString) {

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