Updates

Author: mylinuxforwork

data/com.ml4w.dotfilesinstaller.metainfo.xml.in

@@ -63,6 +63,7 @@
       <description translate="no">
         <p>Release 0.9.8</p>
         <ul>
+          <li>Add more developer tools</li>
           <li>Add "Info" menu button to load configuration overview to installed dotfiles with "Open Homepage" and "Check for Updates" if remote source.</li>
         </ul>
       </description>

docs/.vitepress/config.ts

@@ -23,7 +23,7 @@ export default {
       { text: "Home", link: "/" },
       { text: "About", link: "/getting-started/overview" },
      {
-        text: "0.9.7",
+        text: "0.9.8",
         items: [
           {
             // todo; add CHANGELOG.md in dotfiles-installer repo 

src/classes/information.py

@@ -59,6 +59,8 @@ def show_information(self):
         self.config_homepage.set_visible(True)
         self.config_dependencies.set_visible(True)
         self.props.progress_bar.set_visible(True)
+        self.props.progress_bar.set_visible(True)
+        self.props.btn_dev_menu.set_visible(False)
 
         if not "description" in self.props.config_json:
             self.config_description.set_visible(False)
@@ -75,8 +77,12 @@ def show_information(self):
         else:
             self.config_dependencies.set_subtitle(self.props.config_json["dependencies"])
 
-        self.config_source.set_subtitle(self.props.config_json["source"])
-        self.config_subfolder.set_subtitle(self.props.config_json["subfolder"])
+        if ".git" in self.props.config_json["source"]:
+            self.config_source.set_subtitle(self.props.config_json["source"])
+            self.config_subfolder.set_subtitle(self.props.config_json["subfolder"])
+        else:
+            self.config_source.set_subtitle(home_folder + self.props.config_json["source"])
+            self.config_subfolder.set_subtitle(self.props.config_json["subfolder"])
 
         if ".git" in self.props.config_json["source"]:
             if "tag" in self.props.config_json and not self.props.config_json["tag"] == "":
@@ -103,7 +109,7 @@ def get_source(self):
             shutil.rmtree(self.props.original_folder)
 
         # Download or copy source into downloads folder
-        if ".git" in self.config_source.get_subtitle():
+        if ".git" in self.props.config_json["source"]:
             task = Gio.Task.new(self, self.current_cancellable, self.on_clone_source_sepository_completed, None)
             # task.set_task_data("task_data", None) # Pass our custom data instance to the task
             task.run_in_thread(self.clone_source_sepository)
@@ -183,6 +189,15 @@ def on_get_source_completed(self):
         self.show_replacement = True
         self.props.updateProgressBar(0.2)
 
+    def get_next(self):
+        self.props.config_backup.load()
+
+    def clean_install(self):
+        printLog("Clean installation for " + self.props.config_json["id"])
+        if os.path.exists(self.props.dotfiles_folder):
+            # shutil.rmtree(self.props.dotfiles_folder) # For deleting non-empty directories
+            printLog(self.props.dotfiles_folder + " folder removed successfully")
+
     def writeProjectConfig(self):
         # Add additional information to config.dotinst
         self.props.config_json["dotinst"] = self.props.source_dotinst

src/classes/installation.py

@@ -37,13 +37,15 @@ class Installation(Gtk.Box):
     def __init__(self, **kwargs):
         self.activate_now.connect("notify::active",self.change_activate_now)
 
+
     def load(self):
         printLog("Show installation page")
         if self.props.install_mode == "update":
             self.page_title.set_label("Update")
             self.page_subtitle.set_label("The dotfiles are now prepared for the update.")
 
         self.activate_now.set_active(True)
+        self.props.btn_dev_menu.set_visible(False)
 
         if not get_symlink_enabled():
             self.activate_now.set_active(False)

src/classes/loadconfiguration.py

@@ -113,7 +113,7 @@ def create_row(self,item):
         menu_button.set_icon_name("info-outline-symbolic")
         menu_button.set_menu_model(main_menu)
         menu_button.set_valign(3)
-        row.add_suffix(menu_button)
+        row.add_prefix(menu_button)
 
         if ".git" in item.source and item.dotinst:
             btn = Gtk.Button()
@@ -125,15 +125,11 @@ def create_row(self,item):
             btn = Gtk.Button()
             btn.set_valign(3)
             btn.set_icon_name("arrow3-left-symbolic")
+            btn.get_style_context().add_class("suggested-action")
+
             btn.connect("clicked",self.sync_dotfiles, item.id + ";" + item.source + "/" + item.subfolder + ";" + item.dotinst)
             row.add_suffix(btn)
 
-        btn = Gtk.Button()
-        btn.set_valign(3)
-        btn.set_label("Activate")
-        btn.connect("clicked",self.activate_dotfiles,item.id)
-        row.add_suffix(btn)
-
         if get_dev_enabled():
             main_menu = Gio.Menu.new()
             file_section = Gio.Menu.new()
@@ -159,11 +155,19 @@ def create_row(self,item):
                 main_menu.append_section(None, dev_section)
 
             menu_button = Gtk.MenuButton.new()
-            menu_button.set_icon_name("code-symbolic")
+            menu_button.set_label("Dev")
+            menu_button.get_style_context().add_class("suggested-action")
+            # menu_button.set_icon_name("code-symbolic")
             menu_button.set_menu_model(main_menu)
             menu_button.set_valign(3)
             row.add_suffix(menu_button)
 
+        btn = Gtk.Button()
+        btn.set_valign(3)
+        btn.set_label("Activate")
+        btn.connect("clicked",self.activate_dotfiles,item.id)
+        row.add_suffix(btn)
+
         if item.settings:
             del_btn = Gtk.Button()
             del_btn.set_valign(3)
@@ -251,16 +255,15 @@ def load_installed_dotfiles(self):
                 printLog(dot_json["id"] + " installed")
                 item = DotfilesItem()
                 if "type" in dot_json and "dotinst" in dot_json and dot_json["type"] == "local":
-                    if os.path.exists(home_folder + dot_json["dotinst"]):
-                        printLog("Using local dotinst file: " + home_folder + dot_json["dotinst"])
-                        item.dotinst = home_folder + dot_json["dotinst"]
-                        dot_json = json.load(open(home_folder + dot_json["dotinst"]))
+                    if os.path.exists(dot_json["dotinst"]):
+                        printLog("Using local dotinst file: " + dot_json["dotinst"])
+                        item.dotinst = dot_json["dotinst"]
+                        dot_json = json.load(open(dot_json["dotinst"]))
                     else:
                         printLog("Local dotinst file not exists")
 
                 if "type" in dot_json and "dotinst" in dot_json and dot_json["type"] == "remote":
                     item.dotinst = dot_json["dotinst"]
-                    print(item.dotinst)
 
                 if "settings" in dot_json:
                     item.settings = True
@@ -325,7 +328,9 @@ def load_configuration(self,_):
 
     # Loads JSON content from a local file in the user's home directory asynchronously.
     def _load_json_from_local_file(self):
-        file_path = home_folder + self.config_source
+        file_path = self.config_source
+        #####
+        print(file_path)
         local_file = Gio.File.new_for_path(file_path)
         printLog("Attempting to load file from: " + file_path)
 

src/classes/preferences.py

@@ -72,9 +72,9 @@ def change_dev_log_file(self, switch, GParamBoolean):
     def change_dev(self, switch, GParamBoolean):
         if switch.get_active():
             self.settings.set_boolean("my-enable-dev",True)
-            self.props.btn_add_project.set_visible(True)
+            self.props.btn_dev_menu.set_visible(True)
         else:
             self.settings.set_boolean("my-enable-dev",False)
-            self.props.btn_add_project.set_visible(False)
+            self.props.btn_dev_menu.set_visible(False)
         self.props.config_configuration.load_installed_dotfiles()
 

src/ui/information.ui

@@ -153,10 +153,8 @@
             <property name="title" translatable="yes">Subfolder</property>
           </object>
         </child>
-
       </object>
     </child>
-
   </template>
 
 </interface>

src/ui/window.ui

@@ -12,14 +12,6 @@
           <object class="AdwToolbarView">
         <child type="top">
           <object class="AdwHeaderBar">
-            <child type="start">
-              <object class="GtkButton" id="btn_add_project">
-                <property name="label" translatable="yes">Create Project</property>
-                <property name="visible">false</property>
-                <property name="css-classes">suggested-action</property>
-                <signal name="clicked" handler="on_add_project_action"/>
-              </object>
-            </child>
             <child type="end">
               <object class="GtkMenuButton">
                 <property name="primary">True</property>
@@ -28,6 +20,17 @@
                 <property name="menu-model">primary_menu</property>
               </object>
             </child>
+            <child type="start">
+              <object class="GtkMenuButton" id="btn_dev_menu">
+                <property name="visible">false</property>
+                <property name="label">Dev</property>
+                <property name="tooltip-text" translatable="yes">Main Menu</property>
+                <property name="menu-model">dev_menu</property>
+                <style>
+                  <class name="suggested-action"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
         <child type="bottom">
@@ -236,6 +239,20 @@
         </object>
     </property>
   </template>
+  <menu id="dev_menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Create Project</attribute>
+        <attribute name="action">win.create_project</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Load Project</attribute>
+        <attribute name="action">win.load_project</attribute>
+      </item>
+    </section>
+  </menu>
   <menu id="primary_menu">
     <section>
       <item>
@@ -275,3 +292,4 @@
     </section>
   </menu>
 </interface>
+

src/window.py

@@ -50,9 +50,10 @@ class DotfilesInstallerWindow(Adw.ApplicationWindow):
     config_finish = Gtk.Template.Child()
     config_configuration = Gtk.Template.Child()
     spinner = Gtk.Template.Child()
-    btn_add_project = Gtk.Template.Child()
     toast_overlay = Gtk.Template.Child()
     progress_bar = Gtk.Template.Child()
+    btn_dev_menu = Gtk.Template.Child()
+
     install_mode = "install"
 
     def __init__(self, **kwargs):
@@ -80,7 +81,7 @@ def __init__(self, **kwargs):
         self.progress_bar.set_visible(False)
 
         if get_dev_enabled():
-            self.btn_add_project.set_visible(True)
+            self.btn_dev_menu.set_visible(True)
 
         # self.config_finish.load()
         # self.wizzard_stack.set_visible_child_name("page_finish")
@@ -100,6 +101,8 @@ def create_actions(self):
         self.create_action("dev_push_to_repo",self.on_dev_push_to_repo)
         self.create_action("dev_pull_from_repo",self.on_dev_pull_from_repo)
         self.create_action("run_setup_script",self.on_run_setup_script)
+        self.create_action("create_project",self.on_create_project)
+        self.create_action("load_project",self.on_load_project)
 
         self.open_dotfiles_action = Gio.SimpleAction.new("dev_open_dotfiles_folder", GLib.VariantType.new('s'))
         self.open_dotfiles_action.connect("activate", self.on_dev_open_dotfiles_folder)
@@ -168,6 +171,8 @@ def reset_app(self):
         self.updateProgressBar(0.0)
         self.install_mode = "install"
         self.progress_bar.set_visible(False)
+        if get_dev_enabled():
+            self.btn_dev_menu.set_visible(True)
 
     @Gtk.Template.Callback()
     def on_wizzard_next_action(self, widget):
@@ -176,7 +181,7 @@ def on_wizzard_next_action(self, widget):
                 if self.config_information.show_replacement == False:
                     self.config_information.get_source()
                 else:
-                    self.config_backup.load()
+                    self.config_information.get_next()
             case "page_backup":
                 self.config_backup.create_backup()
             case "page_settings":
@@ -194,10 +199,50 @@ def on_wizzard_next_action(self, widget):
             case "page_finish":
                 self.reset_app()
 
-    @Gtk.Template.Callback()
-    def on_add_project_action(self, widget):
+    def on_create_project(self, widget, _):
         self.add_project.present(self)
 
+    def on_load_project(self, widget, _):
+        self.file_chooser = Gtk.FileChooserNative.new(
+            title="Open .dotinst File",
+            parent=None,
+            action=Gtk.FileChooserAction.OPEN,
+            accept_label="Open",
+            cancel_label="Cancel"
+        )
+
+        # Add a file filter for .dotinst extension
+        file_filter = Gtk.FileFilter()
+        file_filter.set_name(".dotinst Files")
+        file_filter.add_pattern("*.dotinst")
+        self.file_chooser.add_filter(file_filter)
+
+        # Add an "All Files" filter
+        all_files_filter = Gtk.FileFilter()
+        all_files_filter.set_name("All Files")
+        all_files_filter.add_pattern("*")
+        self.file_chooser.add_filter(all_files_filter)
+
+        self.file_chooser.connect("response", self.on_dialog_response)
+        self.file_chooser.show()
+
+    def on_dialog_response(self, dialog, response):
+        if response == Gtk.ResponseType.ACCEPT:
+            # Get the GFile object
+            file = dialog.get_file()
+            if file:
+                # Get the path from the GFile object
+                file_path = file.get_path()
+                if file_path:
+                    print(f"Selected file path: {file_path}")
+                    self.config_configuration.entry_dotinst.set_text(file_path)
+                    self.config_configuration.load_configuration(None)
+                else:
+                    print("Could not get local path for selected file.")
+
+        dialog.destroy()
+        self.file_chooser = None
+
     def updateProgressBar(self,v):
         self.progress_bar.set_fraction(v)
 
@@ -332,7 +377,7 @@ def on_dev_open_project_folder(self, widget, param):
 
     def on_dev_reinstall_dotfiles(self, widget, param):
         self.install_mode = "update"
-        local_dotinst = param.get_string().replace(home_folder,"")
+        local_dotinst = param.get_string()
         self.config_configuration.entry_dotinst.set_text(local_dotinst)
         self.config_configuration.load_configuration(widget)