diff --git a/libgid/scripts/install_name_tool.sh b/libgid/scripts/install_name_tool.sh new file mode 100644 index 000000000..6b36c7f30 --- /dev/null +++ b/libgid/scripts/install_name_tool.sh @@ -0,0 +1,7 @@ +install_name_tool -id @executable_path/../Frameworks/libgid.dylib libgid.dylib +install_name_tool -change libgvfs.1.dylib @executable_path/../Frameworks/libgvfs.dylib libgid.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtOpenGL.framework/Versions/5/QtOpenGL @executable_path/../Frameworks/QtOpenGL.framework/Versions/5/QtOpenGL libgid.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets libgid.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libgid.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore libgid.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork libgid.dylib \ No newline at end of file diff --git a/libgideros/scripts/install_name_tool.sh b/libgideros/scripts/install_name_tool.sh new file mode 100644 index 000000000..54659a8a6 --- /dev/null +++ b/libgideros/scripts/install_name_tool.sh @@ -0,0 +1,4 @@ +install_name_tool -id @executable_path/../Frameworks/libgideros.dylib libgideros.dylib +install_name_tool -change libgid.1.dylib @executable_path/../Frameworks/libgid.dylib libgideros.dylib +install_name_tool -change liblua.1.dylib @executable_path/../Frameworks/liblua.dylib libgideros.dylib +install_name_tool -change libpystring.1.dylib @executable_path/../Frameworks/libpystring.dylib libgideros.dylib \ No newline at end of file diff --git a/libgvfs/scripts/install_name_tool.sh b/libgvfs/scripts/install_name_tool.sh new file mode 100644 index 000000000..3c194885e --- /dev/null +++ b/libgvfs/scripts/install_name_tool.sh @@ -0,0 +1,3 @@ +install_name_tool -id @executable_path/../Frameworks/libgvfs.dylib libgvfs.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libgvfs.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore libgvfs.dylib \ No newline at end of file diff --git a/libpystring/scripts/install_name_tool.sh b/libpystring/scripts/install_name_tool.sh new file mode 100644 index 000000000..28624d523 --- /dev/null +++ b/libpystring/scripts/install_name_tool.sh @@ -0,0 +1,2 @@ +install_name_tool -id @executable_path/../Frameworks/libpystring.dylib libpystring.dylib +install_name_tool -change /Applications/Qt/5.4/clang_64/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore libpystring.dylib \ No newline at end of file diff --git a/lua/scripts/install_name_tool.sh b/lua/scripts/install_name_tool.sh new file mode 100644 index 000000000..19a8bcda7 --- /dev/null +++ b/lua/scripts/install_name_tool.sh @@ -0,0 +1,2 @@ +install_name_tool -id @executable_path/../Frameworks/liblua.dylib liblua.dylib +install_name_tool -change libgvfs.1.dylib @executable_path/../Frameworks/libgvfs.dylib liblua.dylib \ No newline at end of file diff --git a/player/Forms/mainwindow.ui b/player/Forms/mainwindow.ui index 71c8a7d4d..c6d9ac6fb 100644 --- a/player/Forms/mainwindow.ui +++ b/player/Forms/mainwindow.ui @@ -105,6 +105,7 @@ + @@ -181,6 +182,8 @@ + + @@ -197,9 +200,25 @@ + + +Zoom + + + + + + + + + + + + + @@ -351,6 +370,16 @@ Alt+O + + +200% + + + + + 300% + + true @@ -433,7 +462,7 @@ - 25 % + 25% diff --git a/player/Headers/mainwindow.h b/player/Headers/mainwindow.h index e62d94b5c..62a3d9533 100644 --- a/player/Headers/mainwindow.h +++ b/player/Headers/mainwindow.h @@ -68,6 +68,7 @@ class MainWindow : public QMainWindow{ void checkLoadedSettings(); void saveSettings(); void resizeWindow(int width, int height); + void fullScreenWindow(bool _fullScreen); protected: virtual void closeEvent(QCloseEvent*); diff --git a/player/Sources/mainwindow.cpp b/player/Sources/mainwindow.cpp index a2b40aaa5..76fb89090 100644 --- a/player/Sources/mainwindow.cpp +++ b/player/Sources/mainwindow.cpp @@ -43,6 +43,8 @@ void MainWindow::setupUiActions(){ connect(ui.actionQuarter, SIGNAL(triggered()), this, SLOT(actionScale())); connect(ui.actionHalf, SIGNAL(triggered()), this, SLOT(actionScale())); connect(ui.actionOriginal, SIGNAL(triggered()), this, SLOT(actionScale())); + connect(ui.actionDouble, SIGNAL(triggered()), this, SLOT(actionScale())); + connect(ui.actionTriple, SIGNAL(triggered()), this, SLOT(actionScale())); connect(ui.actionZoom_In, SIGNAL(triggered()), this, SLOT(actionScale())); connect(ui.actionZoom_Out, SIGNAL(triggered()), this, SLOT(actionScale())); connect(ui.actionFit_To_Window, SIGNAL(triggered()), this, SLOT(actionScale())); @@ -175,6 +177,8 @@ void MainWindow::setupUiProperties(){ ui.actionQuarter->setProperty("scale", 25); ui.actionHalf->setProperty("scale", 50); ui.actionOriginal->setProperty("scale", 100); + ui.actionDouble->setProperty("scale", 200); + ui.actionTriple->setProperty("scale", 300); ui.actionZoom_In->setProperty("scale", eZoomIn); ui.actionZoom_Out->setProperty("scale", eZoomOut); ui.actionFit_To_Window->setProperty("scale", eFitToWindow); @@ -577,9 +581,16 @@ void MainWindow::updateResolution(){ void MainWindow::updateAutoScale(){ if(autoScale()){ + ui.centralWidget->setMinimumSize(1, 1); + + }else{ + ui.centralWidget->setMinimumSize(0, 0); + QAction *action = resolutionGroup_->checkedAction(); - if(action) - action->setChecked(false); + if(action){ + setWidth(action->property("width").toInt()); + setHeight(action->property("height").toInt()); + } } resolutionGroup_->setEnabled(!autoScale()); @@ -707,6 +718,7 @@ bool MainWindow::fullScreen(){ void MainWindow::setFullScreen(bool fullScreen){ fullScreen_ = fullScreen; + ui.actionFull_Screen->setChecked(fullScreen); } float MainWindow::scale(){ @@ -748,6 +760,11 @@ void MainWindow::resizeWindow(int width, int height){ resize(width, height); } +void MainWindow::fullScreenWindow(bool _fullScreen){ + setFullScreen(_fullScreen); + actionFull_Screen(fullScreen()); +} + void MainWindow::resizeEvent(QResizeEvent*){ if(autoScale()) updateResolution(); diff --git a/player/scripts/copy-generated.sh b/player/scripts/copy-generated.sh new file mode 100644 index 000000000..96c21804f --- /dev/null +++ b/player/scripts/copy-generated.sh @@ -0,0 +1 @@ +cp -r "Gideros Player.app" ../release \ No newline at end of file diff --git a/player/scripts/copy-required.sh b/player/scripts/copy-required.sh new file mode 100644 index 000000000..f45342cb9 --- /dev/null +++ b/player/scripts/copy-required.sh @@ -0,0 +1,5 @@ +cp ../libgid/libgid.dylib "../release/Gideros Player.app/Contents/Frameworks" +cp ../libgideros/libgideros.dylib "../release/Gideros Player.app/Contents/Frameworks" +cp ../libgvfs/libgvfs.dylib "../release/Gideros Player.app/Contents/Frameworks" +cp ../lua/liblua.dylib "../release/Gideros Player.app/Contents/Frameworks" +cp ../libpystring/libpystring.dylib "../release/Gideros Player.app/Contents/Frameworks" \ No newline at end of file diff --git a/player/scripts/install_name_tool.sh b/player/scripts/install_name_tool.sh new file mode 100644 index 000000000..a4dce0566 --- /dev/null +++ b/player/scripts/install_name_tool.sh @@ -0,0 +1,2 @@ +install_name_tool -change libgvfs.1.dylib @executable_path/../Frameworks/libgvfs.dylib "Gideros Player.app/Contents/MacOS/Gideros Player" +install_name_tool -change libpystring.1.dylib @executable_path/../Frameworks/libpystring.dylib "Gideros Player.app/Contents/MacOS/Gideros Player" \ No newline at end of file diff --git a/player/scripts/macdeployqt.sh b/player/scripts/macdeployqt.sh new file mode 100644 index 000000000..f9525699a --- /dev/null +++ b/player/scripts/macdeployqt.sh @@ -0,0 +1 @@ +macdeployqt "Gideros Player.app" \ No newline at end of file