Grimmauld/swaymux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

attempt to fix broken app_id

Browse source
This commit is contained in:
LordGrimmauld 2024-03-09 17:58:15 +01:00
parent 24e3998a1f
commit 1d9dd95949
6 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -12,14 +12,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
set(TS_FILES swaymux_en_US.ts) # set(TS_FILES swaymux_en_US.ts)
set(PROJECT_SOURCES set(PROJECT_SOURCES
main.cpp main.cpp
mainwindow.cpp mainwindow.cpp
mainwindow.h mainwindow.h
mainwindow.ui mainwindow.ui
${TS_FILES} # ${TS_FILES}
tree/pstree.cpp tree/pstree.cpp
tree/PsTreeModel.cpp tree/PsTreeModel.cpp
sway_bindings/Formatter.h sway_bindings/Formatter.h
@ -79,7 +79,7 @@ set_target_properties(swaymux PROPERTIES
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
WIN32_EXECUTABLE TRUE WIN32_EXECUTABLE FALSE
) )
include(GNUInstallDirs) include(GNUInstallDirs)

2
Keys/SwitchToKeybindListener.h
View file

@ -81,7 +81,7 @@ public:
} }
std::string getDescription() override { std::string getDescription() override {
return "Switch to selected container. If multiple containers or a container from scratchpad is selected,\ncreate new workspace and move all windows that are part of the selection to it."; return "Switch to selected container(s)";
} }
std::string getKeyText() override { std::string getKeyText() override {

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709905912, "lastModified": 1709968316,
"narHash": "sha256-TofHtnlrOBCxtSZ9nnlsTybDnQXUmQrlIleXF1RQAwQ=", "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a343533bccc62400e8a9560423486a3b6c11a23b", "rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -1,4 +1,3 @@
{ {
description = "Swaymux: sway workspace/output/container navigation"; description = "Swaymux: sway workspace/output/container navigation";
@ -22,12 +21,15 @@
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
# base toolchain # base toolchain
gcc gcc12
libgcc
qt6.full qt6.full
qtcreator qtcreator
cmake cmake
nlohmann_json nlohmann_json
qtwayland qt6.qtwayland
icu
libcxx
# nix utils # nix utils
self.formatter.${pkgs.system} self.formatter.${pkgs.system}

2
mainwindow.cpp
View file

@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent)
// connect(modelUpdateTimer, &QTimer::timeout, this, QOverload<>::of(&MainWindow::update)); // connect(modelUpdateTimer, &QTimer::timeout, this, QOverload<>::of(&MainWindow::update));
// modelUpdateTimer->start(1000); // modelUpdateTimer->start(1000);
ui->statusbar->showMessage(QString::fromStdString("test test 123")); ui->statusbar->showMessage(QString::fromStdString("Press ? for keybind listing"));
ui->treeView->setModel(model); ui->treeView->setModel(model);
ui->treeView->expandAll(); ui->treeView->expandAll();

15
nix/default.nix
View file

@ -2,13 +2,16 @@
lib, lib,
nlohmann_json, nlohmann_json,
cmake, cmake,
stdenv, gcc12Stdenv,
qt6, qt6,
qtbase, qtbase,
wrapQtAppsHook, wrapQtAppsHook,
qtwayland qtwayland,
icu,
libgcc,
libcxx
}: }:
stdenv.mkDerivation { gcc12Stdenv.mkDerivation {
pname = "swaymux"; pname = "swaymux";
version = "0.1"; version = "0.1";
@ -19,7 +22,7 @@ stdenv.mkDerivation {
''; '';
buildPhase = '' buildPhase = ''
make make -j
''; '';
installPhase = '' installPhase = ''
@ -27,8 +30,8 @@ stdenv.mkDerivation {
mv swaymux $out/bin mv swaymux $out/bin
''; '';
buildInputs = [ qtbase qtwayland cmake nlohmann_json ]; buildInputs = [ icu qtbase qt6.qtwayland cmake nlohmann_json libgcc libcxx ];
nativeBuildInputs = [ wrapQtAppsHook ]; nativeBuildInputs = [ wrapQtAppsHook qt6.qtwayland ];
doCheck = true; doCheck = true;