fix: Cleanup

Author: nlogozzo

.github/workflows/windows.yml

@@ -47,7 +47,7 @@ jobs:
         with:
           pkgs: libnick
           triplet: ${{ matrix.variant.triplet }}
-          revision: e50305684899fdaa0e594679bc533effea0829cc
+          revision: 4887ad6d1414f74cb7cb8d1e527fb46adb4e9ace
           token: ${{ github.token }}
           cache-key: ${{ matrix.variant.triplet }}
       - name: "Build (Installer)"

CONTRIBUTING.md

@@ -54,7 +54,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
 - Collect information about the bug:
   - Debug information provided by the application
     - GNOME: From the main hamburger menu, open About Application → Troubleshooting → Debugging Information and copy the information to the clipboard to paste in your issue.
-    - WinUI: From the Help item in the left-side navigation, open About -> Debugging and copy the information to the clipboard to paste in your issue.
+    - WinUI: From the Help item in the left-side navigation, open About Application --> Debugging and copy the information to the clipboard to paste in your issue.
   - Stack trace (Traceback)
     - Including any error messages thrown by the application
     - You may need to start the application via the terminal/console to receive an error message for a crash.
@@ -140,6 +140,7 @@ The whole project utilizes the [MVC](https://en.wikipedia.org/wiki/Model%E2%80%9
 
 This project contains all of the code used by all platforms of the app:
 - `controllers` => The objects used by UI views to receive and manipulate data from the models.
+- `events` => Arguments that are used by events throughout the application.
 - `helpers` => Useful objects and functions specific to the application that can be used by all platforms.
 - `models` => The data driven objects of the application (i.e. Configuration, Database, etc...).
 
@@ -158,7 +159,7 @@ This project contains all of the code used for the GNOME platform version of the
 This project contains all of the code used for the WinUI platform version of the app:
 - `controls` => Generic controls for the app.
     - These UI objects are separate from views in that they should not be backed by a controller and should be easily ported to any other app.
-- `helpers` => Useful objects and functions specific for the Qt platform version of the app.
+- `helpers` => Useful objects and functions specific for the WinUI platform version of the app.
 - `views` => The views (pages, windows, dialogs, etc...) of the app.
 
 #### Developing and Testing
@@ -173,6 +174,7 @@ Application uses the following naming conventions:
 - `CamelCase` for namespaces and classes
 - `pascalCase` for file names, functions, and variables
 - `m_` prefix appended to class member variables
+- `s_` prefix appended to global static variables
 - `get` and `set` prefixes used for accessor and modifiers methods of a class variable respectively
     - Exception: For boolean class members, `is` and `setIs` should be used as the prefixes for the accessor and modifier methods of said members.
 

org.nickvision.application.gnome/include/helpers/gtkhelpers.h

@@ -8,26 +8,11 @@
 
 namespace Nickvision::Application::GNOME::Helpers::GtkHelpers
 {
-    /**
-     * @brief Adds a widget to a GtkBox.
-     * @param box The box to add the widget to
-     * @param widget The widget to add
-     * @param addSeparator Whether or not to add a separator between the widgets
-     */
-    void addToBox(GtkBox* box, GtkWidget* widget, bool addSeparator = false);
     /**
      * @brief Runs the function on the main UI thread.
      * @param function The function to run 
      */
     void dispatchToMainThread(const std::function<void()>& function);
-    /**
-     * @brief Moves a widget from one box to another.
-     * @param oldBox The old box
-     * @param newBox The new box
-     * @param widget The widget to move
-     * @param addSeparator Whether or not to add a separator between the widgets
-     */
-    void moveFromBox(GtkBox* oldBox, GtkBox* newBox, GtkWidget* widget, bool addSeparator = false);
     /**
      * @brief Sets the accelerator for an action.
      * @param app The GtkApplication

org.nickvision.application.gnome/src/helpers/gtkhelpers.cpp

@@ -2,15 +2,6 @@
 
 namespace Nickvision::Application::GNOME::Helpers
 {
-    void GtkHelpers::addToBox(GtkBox* box, GtkWidget* widget, bool addSeparator)
-    {
-        if(addSeparator && gtk_widget_get_first_child(GTK_WIDGET(box)) != nullptr)
-        {
-            gtk_box_append(box, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL));
-        }
-        gtk_box_append(box, widget);
-    }
-
     void GtkHelpers::dispatchToMainThread(const std::function<void()>& func)
     {
         g_idle_add(+[](gpointer data) -> int
@@ -22,25 +13,6 @@ namespace Nickvision::Application::GNOME::Helpers
         }, new std::function<void()>(func));
     }
 
-    void GtkHelpers::moveFromBox(GtkBox* oldBox, GtkBox* newBox, GtkWidget* widget, bool addSeparator)
-    {
-        GtkWidget* oldSeparator{ gtk_widget_get_prev_sibling(widget) };
-        if(oldSeparator == nullptr)
-        {
-            oldSeparator = gtk_widget_get_next_sibling(widget);
-        }
-        if(addSeparator && oldSeparator && GTK_IS_SEPARATOR(oldSeparator))
-        {
-            gtk_box_remove(oldBox, oldSeparator);
-        }
-        gtk_box_remove(oldBox, widget);
-        if(addSeparator && oldSeparator && GTK_IS_SEPARATOR(oldSeparator) && gtk_widget_get_first_child(GTK_WIDGET(newBox)) != nullptr)
-        {
-            gtk_box_append(newBox, gtk_separator_new(GTK_ORIENTATION_HORIZONTAL));
-        }
-        gtk_box_append(newBox, widget);
-    }
-
     void GtkHelpers::setAccelForAction(GtkApplication* app, const char* action, const char* accel)
     {
         const char* accels[2] { accel, nullptr };

org.nickvision.application.winui/Controls/TitleBar.xaml

@@ -14,17 +14,17 @@
             <ColumnDefinition x:Name="TitleColumn" Width="Auto"/>
             <ColumnDefinition x:Name="SubtitleColumn" Width="Auto"/>
             <ColumnDefinition x:Name="LeftDragColumn" Width="*"/>
-            <ColumnDefinition x:Name="SearchColumn" Width="4*"/>
+            <ColumnDefinition x:Name="SearchColumn" Width="4*" MinWidth="220"/>
             <ColumnDefinition x:Name="RightDragColumn" Width="*" MinWidth="48"/>
             <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
         </Grid.ColumnDefinitions>
 
         <Image x:Name="ImgIcon" Grid.Column="1" VerticalAlignment="Center" Margin="8,0,4,0" Width="18" Height="18" Source="../resources/icon.ico"/>
 
-        <TextBlock x:Name="LblTitle" Grid.Column="2" VerticalAlignment="Center" Margin="4,0,0,0" Style="{ThemeResource CaptionTextBlockStyle}" Text="{x:Bind Title, Mode=OneWay}"/>
+        <TextBlock x:Name="LblTitle" Grid.Column="2" VerticalAlignment="Center" Style="{ThemeResource CaptionTextBlockStyle}" Text="{x:Bind Title, Mode=OneWay}"/>
 
         <TextBlock x:Name="LblSubtitle" Grid.Column="3" VerticalAlignment="Center" Margin="12,0,0,0" Style="{ThemeResource CaptionTextBlockStyle}" Text="{x:Bind Subtitle, Mode=OneWay}" Foreground="Gray"/>
 
-        <AutoSuggestBox x:Name="AsbSearch" Grid.Column="5" QueryIcon="Find" VerticalAlignment="Center" MaxWidth="400" Visibility="{x:Bind SearchVisibility, Mode=OneWay}" TextChanged="OnSearchTextChanged" SuggestionChosen="OnSearchSuggestionChosen"/>
+        <AutoSuggestBox x:Name="AsbSearch" Grid.Column="5" QueryIcon="Find" VerticalAlignment="Center" Margin="0,0,16,0" MaxWidth="400" Visibility="{x:Bind SearchVisibility, Mode=OneWay}" TextChanged="OnSearchTextChanged" SuggestionChosen="OnSearchSuggestionChosen"/>
     </Grid>
 </UserControl>