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
27#include <QColorDialog>27#include <QColorDialog>
28#include <QDesktopWidget>28#include <QDesktopWidget>
29#include <QCheckBox>29#include <QCheckBox>
30#include <QHBoxLayout>
30#include <QImage>31#include <QImage>
31#include <QKeyEvent>32#include <QKeyEvent>
32#include <QMainWindow>33#include <QMainWindow>
@@ -62,6 +63,7 @@ · 29 unmodified lines
62#include <UUID.h>63#include <UUID.h>
63#include <OctreeSceneStats.h>64#include <OctreeSceneStats.h>
64#include <LocalVoxelsList.h>65#include <LocalVoxelsList.h>
66#include <FstReader.h>
65 67
66#include "Application.h"68#include "Application.h"
67#include "ClipboardScriptingInterface.h"69#include "ClipboardScriptingInterface.h"
@@ -290,7 +292,14 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 222 unmodified lines
290 ResourceCache::setNetworkAccessManager(_networkAccessManager);292 ResourceCache::setNetworkAccessManager(_networkAccessManager);
291 ResourceCache::setRequestLimit(3);293 ResourceCache::setRequestLimit(3);
292 294
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);
294 303
295 restoreSizeAndPosition();304 restoreSizeAndPosition();
296 305
@@ -3464,7 +3473,10 @@ void Application::reloadAllScripts() { · 3167 unmodified lines
3464}3473}
3465 3474
3466void Application::uploadFST() {3475void Application::uploadFST() {
3467 _fstReader.zip();3476 FstReader reader;
3477 if (reader.zip()) {
3478 reader.send();
3479 }
3468}3480}
3469 3481
3470void Application::removeScriptName(const QString& fileNameString) {3482void 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