Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-07-08 02:57:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dashie' into ina

Browse source
This commit is contained in:
Dashie 2023-11-12 12:57:08 +01:00 • committed by GitHub
commit 831baee601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 444 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/resources/resetPasswordPopup.ui
View file

@ -1,23 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.0"/>
<template class="resetPasswordPopup" parent="AdwWindow">
<child>
<object class="GtkBox">
<child>
<object class="GtkEntry" id="resetWifiPasswordEntry">
<property name="activates-default">True</property>
<property name="invisible-char-set">True</property>
</object>
</child>
<child>
<object class="GtkButton" id="resetWifiPasswordButton">
<property name="label">connect</property>
</object>
</child>
</object>
</child>
</template>
</interface>

33
src/resources/resetPopup.ui
View file

@ -2,19 +2,38 @@
<!-- Created with Cambalache 0.17.0 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.0"/>
<template class="resetPopup" parent="AdwWindow">
<template class="resetPopup" parent="GtkPopover">
<child>
<object class="GtkBox">
<property name="homogeneous">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkEntry" id="resetPopopEntry">
<property name="activates-default">True</property>
<property name="invisible-char-set">True</property>
<object class="GtkLabel" id="resetPopupLabel">
<property name="visible">False</property>
</object>
</child>
<child>
<object class="GtkButton" id="resetPopopButton">
<property name="label">connect</property>
<object class="GtkBox">
<child>
<object class="GtkPasswordEntry" id="resetPopupEntry">
<property name="activates-default">True</property>
<property name="margin-bottom">5</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="placeholder-text">Wifi Password</property>
<property name="show-peek-icon">True</property>
</object>
</child>
<child>
<object class="GtkButton" id="resetPopupButton">
<property name="label">connect</property>
<property name="margin-bottom">5</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
</object>
</child>
</object>
</child>
</object>

23
src/resources/resetSavedWifiEntry.ui Normal file
View file

@ -0,0 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<interface>
<requires lib="gtk" version="4.12"/>
<template class="resetSavedWifiEntry" parent="GtkBox">
<property name="spacing">5</property>
<child>
<object class="GtkButton" id="resetDeleteSavedWifiButton">
<property name="has-frame">False</property>
<property name="icon-name">user-trash-symbolic</property>
</object>
</child>
<child>
<object class="GtkButton" id="resetEditSavedWifiButton">
<property name="has-frame">False</property>
<property name="icon-name">document-edit-symbolic</property>
</object>
</child>
<child>
<object class="GtkLabel" id="resetSavedWifiLabel"/>
</child>
</template>
</interface>

5
src/resources/resetSettingBox.ui
View file

@ -11,5 +11,10 @@
</object>
</property>
<property name="width-request">500</property>
<child>
<object class="GtkLabel" id="resetSettingLabel">
<property name="css-classes">resetSettingLabel</property>
</object>
</child>
</template>
</interface>

45
src/resources/resetUI.cmb
View file

@ -14,7 +14,8 @@
(13,1,None,"resetMicSourceEntry.ui",None,None,None,None,None,None,None),
(14,2,None,"resetSettingBox.ui",None,None,None,None,None,None,None),
(15,1,None,"resetListBoxRow.ui",None,None,None,None,None,None,None),
(16,1,None,"resetPopup.ui",None,None,None,None,None,None,None)
(16,6,None,"resetPopup.ui",None,None,None,None,None,None,None),
(17,1,None,"resetSavedWifiEntry.ui",None,None,None,None,None,None,None)
</ui>
<object>
(3,1,"AdwApplicationWindow","resetUI",None,None,None,None,-1," &lt;child&gt;\n &lt;object id=\"resetSidebarBreakpoint\" class=\"AdwBreakpoint\"&gt;\n &lt;/object&gt;\n &lt;/child&gt;"),
@ -34,8 +35,8 @@
(3,34,"GtkBox","resetPath",25,None,None,None,3,None),
(3,35,"GtkPopoverMenu","resetPopoverMenu",33,None,None,None,-1,None),
(3,36,"GtkBox",None,35,None,None,None,-1,None),
(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,1,None),
(3,39,"GtkButton","resetAboutButton",36,None,None,None,2,None),
(3,38,"GtkButton","resetPreferenceButton",36,None,None,None,2,None),
(3,39,"GtkButton","resetAboutButton",36,None,None,None,1,None),
(3,40,"GtkScrolledWindow",None,18,None,None,None,1,None),
(3,41,"GtkViewport",None,40,None,None,None,None,None),
(3,42,"GtkListBox","resetSidebarList",41,None,None,None,None,None),
@ -83,6 +84,7 @@
(5,7,"GtkButton","resetWifiButton",2,None,None,None,4,None),
(5,8,"GtkImage","resetWifiConnected",2,None,None,None,3,None),
(5,10,"GtkImage","resetWifiStored",2,None,None,None,2,None),
(5,11,"resetPopup","resetWifiPopup",2,None,None,None,-1,None),
(6,1,"GtkListBoxRow","resetSidebarEntry",None,None,None,None,None,None),
(6,2,"GtkBox",None,1,None,None,None,-1,None),
(6,6,"GtkImage","resetSidebarImage",2,None,None,None,None,None),
@ -157,10 +159,16 @@
(14,2,"GtkFrame","resetSettingFrame",None,None,None,None,-1,None),
(14,3,"GtkLabel","resetSettingLabel",2,None,None,None,-1,None),
(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
(16,1,"AdwWindow","resetPopup",None,None,None,None,-1,None),
(16,2,"GtkBox",None,1,None,None,None,-1,None),
(16,3,"GtkEntry","resetPopopEntry",2,None,None,None,-1,None),
(16,4,"GtkButton","resetPopopButton",2,None,None,None,-1,None)
(16,6,"GtkPopover","resetPopup",None,None,None,None,-1,None),
(16,7,"GtkBox",None,6,None,None,None,None,None),
(16,10,"GtkBox",None,7,None,None,None,1,None),
(16,11,"GtkPasswordEntry","resetPopupEntry",10,None,None,None,None,None),
(16,12,"GtkButton","resetPopupButton",10,None,None,None,1,None),
(16,13,"GtkLabel","resetPopupLabel",7,None,None,None,None,None),
(17,1,"GtkBox","resetSavedWifiEntry",None,None,None,None,-1,None),
(17,2,"GtkLabel","resetSavedWifiLabel",1,None,None,None,2,None),
(17,3,"GtkButton","resetEditSavedWifiButton",1,None,None,None,1,None),
(17,4,"GtkButton","resetDeleteSavedWifiButton",1,None,None,None,None,None)
</object>
<object_property>
(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@ -482,9 +490,26 @@
(14,3,"GtkWidget","css-classes","resetSettingLabel",None,None,None,None,None,None,None,None,None),
(15,1,"GtkListBoxRow","selectable","False",None,None,None,None,None,None,None,None,None),
(15,1,"GtkWidget","height-request","40",None,None,None,None,None,None,None,None,None),
(16,3,"GtkEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
(16,3,"GtkEntry","invisible-char-set","True",None,None,None,None,None,None,None,None,None),
(16,4,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None)
(16,7,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
(16,7,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(16,11,"GtkPasswordEntry","activates-default","True",None,None,None,None,None,None,None,None,None),
(16,11,"GtkPasswordEntry","placeholder-text","Wifi Password",None,None,None,None,None,None,None,None,None),
(16,11,"GtkPasswordEntry","show-peek-icon","True",None,None,None,None,None,None,None,None,None),
(16,11,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(16,11,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(16,11,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(16,11,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
(16,12,"GtkButton","label","connect",None,None,None,None,None,None,None,None,None),
(16,12,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(16,12,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(16,12,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(16,12,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
(16,13,"GtkWidget","visible","False",None,None,None,None,None,None,None,None,None),
(17,1,"GtkBox","spacing","5",None,None,None,None,None,None,None,None,None),
(17,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
(17,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
(17,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
(17,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None)
</object_property>
<object_data>
(3,42,"GtkWidget",1,1,None,None,None,None,None,None),

32
src/resources/resetWiFi.ui
View file

@ -107,8 +107,6 @@
</child>
<child>
<object class="GtkButton" id="resetWifiAdvanced">
<property name="action-name">navigation.push</property>
<property name="action-target">'advanced'</property>
<property name="halign">start</property>
<property name="label">Advanced</property>
<property name="margin-start">5</property>
@ -149,18 +147,34 @@
<property name="tag">saved</property>
<child>
<object class="GtkBox">
<property name="homogeneous">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="label">saved networks</property>
<object class="GtkBox">
<child>
<object class="GtkLabel">
<property name="label">saved networks</property>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">navigation.pop</property>
<property name="halign">start</property>
<property name="label">back</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="valign">start</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton">
<property name="action-name">navigation.pop</property>
<property name="halign">start</property>
<property name="label">back</property>
<object class="GtkListBox" id="resetStoredWifiList">
<property name="css-classes">boxed-list</property>
<property name="margin-bottom">10</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
<property name="show-separators">True</property>
<property name="valign">start</property>
</object>
</child>

3
src/resources/resetWifiEntry.ui
View file

@ -4,6 +4,9 @@
<requires lib="gtk" version="4.12"/>
<template class="resetWifiEntry" parent="GtkBox">
<property name="margin-start">5</property>
<child>
<object class="resetPopup" id="resetWifiPopup"/>
</child>
<child>
<object class="GtkBox">
<property name="width-request">35</property>

2
src/resources/resources.gresource.xml
View file

@ -7,11 +7,13 @@
<file compressed="true" preprocess="xml-stripblanks">resetListBoxRow.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetWiFi.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetWifiEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetSavedWifiEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetBluetooth.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetBluetoothEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetAudio.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetAudioSourceEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetMicrophone.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetMicSourceEntry.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
</gresource>
</gresources>