Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"fixed" formatting issues and code cleanup

Browse source
This commit is contained in:
Niraj Venkat 2015-06-03 14:48:25 -07:00
parent 57004c61c7
commit 694272ffaa
4 changed files with 57 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/MainWindow.cpp
View file

@ -26,9 +26,9 @@
#include "Util.h" #include "Util.h"
MainWindow::MainWindow(QWidget* parent) : MainWindow::MainWindow(QWidget* parent) :
QMainWindow(parent), QMainWindow(parent),
_windowGeometry("WindowGeometry"), _windowGeometry("WindowGeometry"),
_windowState("WindowState", 0) _windowState("WindowState", 0)
{ {
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -94,17 +94,20 @@ void MainWindow::changeEvent(QEvent* event) {
stateChangeEvent->oldState() == Qt::WindowMaximized) && stateChangeEvent->oldState() == Qt::WindowMaximized) &&
windowState() == Qt::WindowMinimized) { windowState() == Qt::WindowMinimized) {
emit windowShown(false); emit windowShown(false);
} else { }
else {
emit windowShown(true); emit windowShown(true);
} }
if (isFullScreen() != Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen)) { if (isFullScreen() != Menu::getInstance()->isOptionChecked(MenuOption::Fullscreen)) {
Menu::getInstance()->setIsOptionChecked(MenuOption::Fullscreen, isFullScreen()); Menu::getInstance()->setIsOptionChecked(MenuOption::Fullscreen, isFullScreen());
} }
} else if (event->type() == QEvent::ActivationChange) { }
else if (event->type() == QEvent::ActivationChange) {
if (isActiveWindow()) { if (isActiveWindow()) {
emit windowShown(true); emit windowShown(true);
} else { }
else {
emit windowShown(false); emit windowShown(false);
} }
} }
@ -119,11 +122,5 @@ void MainWindow::dragEnterEvent(QDragEnterEvent* event)
void MainWindow::dropEvent(QDropEvent* event) void MainWindow::dropEvent(QDropEvent* event)
{ {
/*QList<QUrl> urls = event->mimeData()->urls();
foreach(QUrl url, urls)
{
qDebug() << "urlmessage" << url.toString();
}*/
QCoreApplication::sendEvent(QCoreApplication::instance(), event); QCoreApplication::sendEvent(QCoreApplication::instance(), event);
} }

38
interface/src/ui/Snapshot.cpp
View file

@ -35,20 +35,7 @@ const QString FILENAME_PATH_FORMAT = "hifi-snap-by-%1-on-%2.jpg";
const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss"; const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss";
const QString SNAPSHOTS_DIRECTORY = "Snapshots"; const QString SNAPSHOTS_DIRECTORY = "Snapshots";
const QString LOCATION_X = "location-x"; const QString URL = "highfidelity_url";
const QString LOCATION_Y = "location-y";
const QString LOCATION_Z = "location-z";
const QString ORIENTATION_X = "orientation-x";
const QString ORIENTATION_Y = "orientation-y";
const QString ORIENTATION_Z = "orientation-z";
const QString ORIENTATION_W = "orientation-w";
const QString PATH = "path";
const QString DOMAIN_KEY = "domain";
const QString URL = "url";
Setting::Handle<QString> Snapshot::snapshotsLocation("snapshotsLocation", Setting::Handle<QString> Snapshot::snapshotsLocation("snapshotsLocation",
QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)); QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
@ -95,25 +82,6 @@ QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) { QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) {
//Avatar* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
//
//glm::vec3 location = avatar->getPosition();
//glm::quat orientation = avatar->getHead()->getOrientation();
//
//// add metadata
//shot.setText(LOCATION_X, QString::number(location.x));
//shot.setText(LOCATION_Y, QString::number(location.y));
//shot.setText(LOCATION_Z, QString::number(location.z));
//
//shot.setText(ORIENTATION_X, QString::number(orientation.x));
//shot.setText(ORIENTATION_Y, QString::number(orientation.y));
//shot.setText(ORIENTATION_Z, QString::number(orientation.z));
//shot.setText(ORIENTATION_W, QString::number(orientation.w));
//
//shot.setText(DOMAIN_KEY, DependencyManager::get<NodeList>()->getDomainHandler().getHostname());
//
//shot.setText(PATH, QString::number());
// adding URL to snapshot // adding URL to snapshot
QUrl currentURL = DependencyManager::get<AddressManager>()->currentAddress(); QUrl currentURL = DependencyManager::get<AddressManager>()->currentAddress();
shot.setText(URL, currentURL.toString()); shot.setText(URL, currentURL.toString());
@ -149,7 +117,9 @@ QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) {
imageFile->close(); imageFile->close();
return imageFile; return imageFile;
} else {
}
else {
QTemporaryFile* imageTempFile = new QTemporaryFile(QDir::tempPath() + "/XXXXXX-" + filename); QTemporaryFile* imageTempFile = new QTemporaryFile(QDir::tempPath() + "/XXXXXX-" + filename);
if (!imageTempFile->open()) { if (!imageTempFile->open()) {