Merge pull request #198 from oskarsh/beta

v3.3

.gitignore

@@ -3,7 +3,7 @@ __pycache__
 build-test*
 build-ui-*
 .vscode
-src/build.py
+yin_yang/build.py
 setup.py
 
 .idea/

README.md

@@ -45,7 +45,7 @@ Yin-Yang can be downloaded from AUR as [yin-yang](https://aur.archlinux.org/pack
 
 
 ### Source
-Yin-Yang depends on `python-systemd` and `pyside6` from pypi. `python-systemd` requires you have installed the systemd-headers from your package manager.
+Yin-Yang depends on `python-systemd` and `pyside6` from pypi. `python-systemd` requires you have installed the systemd-headers from your package manager. You also need python development headers (e.g. `python3-devel`).
 
 For CentOS, RHEL, and Fedora:
 ```bash
@@ -68,21 +68,20 @@ Then you can install Yin-Yang in a python virtual environment:
 ```bash
 # bash is necessary to run the source command
 bash
-# Removes any already present Yin-Yang code
-rm -rf Yin-Yang
 # Clones the code to your local machine
 git clone https://github.com/oskarsh/Yin-Yang.git
-# Enters the directory containing Yin-Yang's code
-if pwd != "Yin-Yang"; then cd Yin-Yang; fi
-## Creates a virtual environment for pypi (pip) packages
-python3 -m venv .venv
-source .venv/bin/activate
-# Installs pip requirements specified in repository
-pip3 install -r requirements.txt
+cd Yin-Yang
 # Installs Yin-Yang
 ./scripts/install.sh
 ```
 
+For development, skip the install and instead create a venv in your home directory:
+```bash
+python -m venv .venv
+source .venv/bin/activate  # this is for bash, there are similar scripts in the that directory for other shells like fish
+pip install -r requirements.txt
+```
+
 ## Documentation
 
 Want to help out? Check out the wiki to learn how to contribute translations, plugins and more!

designer/main_window.ui

@@ -43,7 +43,7 @@
        </size>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="settings">
        <attribute name="title">
@@ -276,6 +276,26 @@
           </layout>
          </widget>
         </item>
+        <item>
+         <widget class="QWidget" name="manual_buttons" native="true">
+          <layout class="QHBoxLayout" name="horizontalLayout_3">
+           <item>
+            <widget class="QPushButton" name="button_light">
+             <property name="text">
+              <string>Light</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="button_dark">
+             <property name="text">
+              <string>Dark</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item>
          <widget class="QCheckBox" name="toggle_sound">
           <property name="text">
@@ -290,6 +310,30 @@
           </property>
          </widget>
         </item>
+        <item>
+         <layout class="QFormLayout" name="bootOffsetSettings">
+          <item row="0" column="0">
+           <widget class="QLabel" name="bootOffsetLabel">
+            <property name="toolTip">
+             <string>Time to wait until the system finished booting. Default value is 10 seconds.</string>
+            </property>
+            <property name="text">
+             <string>Delay after boot:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="bootOffset">
+            <property name="suffix">
+             <string>s</string>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QLabel" name="label_active">
           <property name="text">
@@ -330,8 +374,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>523</width>
-             <height>663</height>
+             <width>518</width>
+             <height>88</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="plugins_scroll_content_layout">
@@ -340,16 +384,19 @@
               <item>
                <widget class="QGroupBox" name="samplePluginGroupBox">
                 <property name="title">
-                 <string>Sample Plugin</string>
+                 <string notr="true">Sample Plugin</string>
                 </property>
                 <layout class="QHBoxLayout" name="horizontalLayout_2">
                  <item>
                   <widget class="QComboBox" name="comboBox">
+                   <property name="currentText">
+                    <string notr="true"/>
+                   </property>
                    <property name="sizeAdjustPolicy">
                     <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
                    </property>
                    <property name="placeholderText">
-                    <string>[email protected]</string>
+                    <string notr="true">[email protected]</string>
                    </property>
                   </widget>
                  </item>
@@ -362,7 +409,7 @@
                     <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
                    </property>
                    <property name="placeholderText">
-                    <string>[email protected]</string>
+                    <string notr="true">[email protected]</string>
                    </property>
                   </widget>
                  </item>
@@ -402,12 +449,12 @@
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>273</x>
-     <y>308</y>
+     <x>289</x>
+     <y>225</y>
     </hint>
     <hint type="destinationlabel">
-     <x>254</x>
-     <y>379</y>
+     <x>270</x>
+     <y>353</y>
     </hint>
    </hints>
   </connection>
@@ -418,12 +465,12 @@
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>114</x>
-     <y>192</y>
+     <x>130</x>
+     <y>109</y>
     </hint>
     <hint type="destinationlabel">
-     <x>219</x>
-     <y>280</y>
+     <x>235</x>
+     <y>197</y>
     </hint>
    </hints>
   </connection>
@@ -434,14 +481,30 @@
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>188</x>
-     <y>153</y>
+     <x>198</x>
+     <y>66</y>
     </hint>
     <hint type="destinationlabel">
      <x>188</x>
      <y>318</y>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>btn_enable</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>manual_buttons</receiver>
+   <slot>setHidden(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>109</x>
+     <y>58</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>274</x>
+     <y>398</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

requirements.txt

@@ -1,10 +1,6 @@
-numpy==1.23.5
-psutil==5.9.4
-PySide6==6.4.1
-PySide6-Addons==6.4.1
-PySide6-Essentials==6.4.1
-python-dateutil==2.8.2
-shiboken6==6.4.1
-six==1.16.0
+psutil==5.9.5
+PySide6==6.5.3
+PySide6-Addons==6.5.3
 suntime==1.2.5
-systemd-python==234
+systemd-python==235
+requests~=2.28.2