diff --git a/tromjaro/xfce/Packages-Desktop b/tromjaro/xfce/Packages-Desktop index 8d9c0a0e..4b37729a 100644 --- a/tromjaro/xfce/Packages-Desktop +++ b/tromjaro/xfce/Packages-Desktop @@ -34,7 +34,7 @@ marble peek gnome-sound-recorder popsicle -beaver-notes-bin +beaver-notes jami-qt newsflash mousepad @@ -320,7 +320,7 @@ xdg-utils ## Misc -manjaro-hotfixes + >basic squashfs-tools xiccd # enable color profile settings diff --git a/tromjaro/xfce/Packages-Live b/tromjaro/xfce/Packages-Live index 36c9a43f..ffed5daf 100644 --- a/tromjaro/xfce/Packages-Live +++ b/tromjaro/xfce/Packages-Live @@ -15,6 +15,6 @@ virtualbox-guest-utils #TROM -tromjaro-calamares-theme +#tromjaro-calamares-theme grub-theme-live-common grub-theme-live-tromjaro \ No newline at end of file diff --git a/tromjaro/xfce/Packages-Mhwd b/tromjaro/xfce/Packages-Mhwd index ca85fa99..f7a638c5 100644 --- a/tromjaro/xfce/Packages-Mhwd +++ b/tromjaro/xfce/Packages-Mhwd @@ -59,7 +59,6 @@ xf86-video-dummy xf86-video-fbdev xf86-video-intel xf86-video-nouveau -xf86-video-openchrome xf86-video-sisusb xf86-video-vesa xf86-video-vmware diff --git a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/beaver-notes.desktop b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/beaver-notes.desktop index 2448849a..76e079b1 100644 --- a/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/beaver-notes.desktop +++ b/tromjaro/xfce/desktop-overlay/etc/skel/.local/share/applications/beaver-notes.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Name=Notes -Exec=/opt/Beaver-notes/beaver-notes %U -Terminal=false + Type=Application +Version=1.0 +Name=Notes +Comment=Privacy focused note taking app +Path=/usr/lib/beaver-notes +Exec=/usr/bin/beaver-notes Icon=notes-app -StartupWMClass=Beaver Notes -Comment=Your Personal Note-Taking Haven for Privacy and Efficiency -Categories=Productivity; -Path= -StartupNotify=false +Terminal=false \ No newline at end of file diff --git a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/branding.desc b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/branding.desc index 71660072..7d9046ca 100644 --- a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/branding.desc +++ b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/branding.desc @@ -10,17 +10,23 @@ strings: shortVersionedName: TROMjaro bootloaderEntryName: TROMjaro + images: productLogo: "logo.png" productIcon: "logo.png" productWelcome: "languages.png" slideshow: "show.qml" -slideshowAPI: 1 +slideshowAPI: 2 + +windowSize: 800px,520px +windowPlacement: center + +sidebar: none +navigation: widget style: - sidebarBackground: "#23252e" + sidebarBackground: "#263238" sidebarText: "#efefef" - sidebarTextSelect: "#2eb69b" - sidebarTextHighlight: "#292c37" - Background: "#23252e" + sidebarTextSelect: "#4d915e" + sidebarTextHighlight: "#1a1c1b" diff --git a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/languages.png b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/languages.png new file mode 100644 index 00000000..c075b3e5 Binary files /dev/null and b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/languages.png differ diff --git a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/logo.png b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/logo.png new file mode 100644 index 00000000..c8f915fa Binary files /dev/null and b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/logo.png differ diff --git a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/slide1.png b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/slide1.png index 335c22c5..28f0a574 100644 Binary files a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/slide1.png and b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/slide1.png differ diff --git a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/stylesheet.qss b/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/stylesheet.qss deleted file mode 100644 index 4a2391ad..00000000 --- a/tromjaro/xfce/live-overlay/etc/calamares/branding/manjaro/stylesheet.qss +++ /dev/null @@ -1,440 +0,0 @@ -/* -A branding component can ship a stylesheet (like this one) -which is applied to parts of the Calamares user-interface. -In principle, all parts can be styled through CSS. -Missing parts should be filed as issues. - -The IDs are based on the object names in the C++ code. - -Documentation for styling Qt Widgets through a stylesheet -can be found at - https://doc.qt.io/qt-5/stylesheet-examples.html -In Calamares, styling widget classes is supported (e.g. -using `QComboBox` as a selector). You can also use specific -object names (ids), which you can find through debugging tools. -*/ - - -#mainText{ - font : bold 18px; -} - -#logoApp { - min-height: 80px; - margin-bottom: 50px; -} - - -QVBoxLayout { - background-color: #23252e; - color: #e4e4e4; -} - -QProgressBar::chunk { - background-color: #23252e; -} - - - -#textBoxVerifiedRootPassword - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - - - -#textBoxRootPassword - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - - - - -#checkBoxReusePassword - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - - -#labelChooseRootPassword - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} -#checkBoxDoAutoLogin - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - - -#password_label_2 - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - -#textBoxUserVerifiedPassword - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - -#textBoxUserPassword - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - - - - -#hostname_label_2 - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - -#textBoxHostName - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - - - - -#username_label_2 - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - -#textBoxLoginName - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - - - - -#labelWhatIsYourName - { - margin-top: 10px; - margin-left: 5px; -text-transform: uppercase; -} - -#textBoxFullName - { -height:40px; -margin:10px; -border:1px solid; -display:inline-box; -text-transform: lowercase; -color: #ccc; -} - - -#sidebarMenuApp -{ -text-transform: uppercase; -font: bold; -} - - - -#aboutButton:hover - -{ -width:0px; -font: 0px; -color: #292c37; -background-color: #292c37; -border: 0px; -} - - -#aboutButton - -{ -border: 0px; -width:0px; -font: 0px; -color: #292c37; -} - -QComboBox::drop-down -{ - width: 30px; -font-weight: bold;color: #5E749C; - font: bold 15px #ffffff; - selection-background-color: #fff; - -} - -QComboBox QAbstractItemView -{ - border: 1px solid; - selection-background-color: #2eb398; -} - -QComboBox - { -color: #fff; -border: 1px solid rgb(54, 57, 62,0); -padding: 10px; - selection-background-color: #fff; -} - -QAbstractItemView::item:hover { -background-color: rgb(46, 179, 152); -color: #fff; -} - - - -QAbstractItemView::item { -padding: 10px; -color: #2eb398; -border-bottom: 1px solid #1e1e1e; -} - -#view-button-back { -background-color: rgb(54, 57, 62); -color: #bcbcbc; -text-transform: uppercase; -border: 1px; -padding:10px; -margin: 5px; - font : bold 15px; - width: 100%; -} - -#view-button-back:hover { -background-color: #272727; -color: #bcbcbc; -} - -#view-button-next:hover { -background-color: rgb(46, 179, 152,0.3); -color: #bcbcbc; -} - -#view-button-cancel:hover { -background-color: rgb(169, 65, 80,0.3); -color: #bcbcbc; -} - -#view-button-next { -background-color: rgb(46, 179, 152); -color: #fff; -text-transform: uppercase; -border: 1px; -padding:10px; -margin: 5px; - font : bold 15px; - width: 100%; -} - - -#view-button-cancel { -background-color: rgb(169, 65, 80); -color: #fff; -text-transform: uppercase; -border: 1px; -padding:10px; -margin-right: 5px; - font : bold 15px; - width: 100%; -} - -#restartCheckBox -{ -font: bold; - text-transform: uppercase; -} - -#mainApp { -background-color: #292c37; -} - -#mainText{ - font : bold 11px; -} - -#logoApp { - min-height: 80px; - margin-bottom: 50px; -} - - -#physicalModelSelector { -color: #ffffff; -background-color: #2eb398; -text-transform: uppercase; -} - -#label { -color: #ffffff; -text-transform: uppercase; -font: bold; -margin-left: 20px; -} - -#viewManagerStack { -margin: 20px; -} - -#summaryStep { -background-color: #292c37; -} - - -#m_drivesLabel { -color: #ffffff; -background-color: #2eb398; -font: 15px; -width:300px; -padding-left: 10px; -padding-right: 10px; -text-transform: uppercase; -} - - -#hLine -{ -background-color: #2eb398; - -} - -#m_encryptCheckBox { -color: #ffffff; -background-color: rgb(169, 65, 80); -text-transform: uppercase; -padding: 20px; -font: bold 13px; -margin-top: 5px; -border: 2px #fff; -} - -#m_itemsScrollArea { -color: #ffffff; -background-color: #292c37; -padding: 20px; -margin-top: 20px; -} - -#m_iconLabel { -color: #ffffff; -width: 20px; -height:10px; - -} - -#partitionLabel { -color: #fff; -background-color: #292c37; -text-transform: uppercase; -} - -#m_previewAfterLabel { -color: #fff; -padding:10px; -text-transform: uppercase; -} - -#m_previewBeforeLabel { -color: #fff; -padding:10px; -text-transform: uppercase; -} - - -#partitionBarView { -color: #ffffff; -background-color: #23252e; -} - -#partitionLabel { -color: #ffffff; -} - -#bootInfoLabel { -color: #ffffff; -background-color: rgb(169, 65, 80); -} - -#deviceInfoLabel { -color: #ffffff; -background-color: rgb(169, 65, 80); -} - -QPushButton:hover { -color: #ffffff; -background-color: #272727; -padding:10px; -text-transform: uppercase; -border: 1px solid; -} - -QPushButton { -margin:5px; -color: #ffffff; -background-color: #23252e; -padding:10px; -text-transform: uppercase; -border: 1px solid; -} - -#backgroundWidget -{background-color: #292c37; -} - - -#debugButton { -color: #ffffff; -background-color: rgb(169, 65, 80); -} -