Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
fe0b36dc34 | |||
1864ff5b7f | |||
fb1ad2ba06 |
17
.github/workflows/macos.yml
vendored
Normal file
17
.github/workflows/macos.yml
vendored
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
name: MyCi_MacOS
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: macos-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v1
|
||||||
|
- name: Install Qt
|
||||||
|
uses: jurplel/install-qt-action@v2.2.1
|
||||||
|
- name: Run a qt project
|
||||||
|
run: |
|
||||||
|
cmake ./
|
||||||
|
make
|
@ -133,7 +133,7 @@ install (
|
|||||||
|
|
||||||
# CPACK: General Settings
|
# CPACK: General Settings
|
||||||
set (CPACK_GENERATOR "TBZ2")
|
set (CPACK_GENERATOR "TBZ2")
|
||||||
set (CPACK_PACKAGE_NAME "PineapplePictures")
|
set (CPACK_PACKAGE_NAME "pineapple-pictures")
|
||||||
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Yet another image viewer")
|
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Yet another image viewer")
|
||||||
set (CPACK_PACKAGE_VENDOR "Gary Wang")
|
set (CPACK_PACKAGE_VENDOR "Gary Wang")
|
||||||
set (CPACK_PACKAGE_CONTACT "https://github.com/BLumia/PineapplePictures/issues/")
|
set (CPACK_PACKAGE_CONTACT "https://github.com/BLumia/PineapplePictures/issues/")
|
||||||
@ -142,7 +142,9 @@ if (WIN32)
|
|||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
# ...
|
# ...
|
||||||
elseif (UNIX)
|
elseif (UNIX)
|
||||||
set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
|
set (CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
|
set (CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5svg5")
|
||||||
|
set (CPACK_DEBIAN_PACKAGE_RECOMMENDS "kimageformat-plugins")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
@ -125,6 +125,10 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
connect(nextPictureShorucut, &QShortcut::activated,
|
connect(nextPictureShorucut, &QShortcut::activated,
|
||||||
this, &MainWindow::galleryNext);
|
this, &MainWindow::galleryNext);
|
||||||
|
|
||||||
|
QShortcut * fullscreenShorucut = new QShortcut(QKeySequence(QKeySequence::FullScreen), this);
|
||||||
|
connect(fullscreenShorucut, &QShortcut::activated,
|
||||||
|
this, &MainWindow::toggleFullscreen);
|
||||||
|
|
||||||
centerWindow();
|
centerWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -561,3 +565,12 @@ void MainWindow::quitAppAction(bool force)
|
|||||||
closeWindow();
|
closeWindow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::toggleFullscreen()
|
||||||
|
{
|
||||||
|
if (isFullScreen()) {
|
||||||
|
showNormal();
|
||||||
|
} else {
|
||||||
|
showFullScreen();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -53,6 +53,7 @@ protected slots:
|
|||||||
void toggleStayOnTop();
|
void toggleStayOnTop();
|
||||||
bool stayOnTop();
|
bool stayOnTop();
|
||||||
void quitAppAction(bool force = false);
|
void quitAppAction(bool force = false);
|
||||||
|
void toggleFullscreen();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QPoint m_oldMousePos;
|
QPoint m_oldMousePos;
|
||||||
|
Reference in New Issue
Block a user