Merge branch 'dynamic-searchbar'

CMakeLists.txt

@@ -70,7 +70,6 @@
         src/Constants.vala        
         src/Bookmark.vala
         src/StackManager.vala
-        src/BookmarkListManager.vala
         src/Dialogs/Preferences.vala
         src/Dialogs/DeleteConfirm.vala
         src/Dialogs/Alert.vala

data/com.github.bartzaalberg.bookmark-manager.appdata.xml

@@ -17,6 +17,16 @@
     </ul>
   </description>
   <releases>
+    <release version="1.3.5" date="2017-11-10">
+      <description>
+        <p>1.3.5</p>
+        <ul>
+          <li>HeaderBar is now dynamic</li>
+          <li>Searchbar is disabled when no bookmarks are found</li>
+          <li>Added a cool dynamic cancel button in the headerBar</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.3.4" date="2017-10-30">
       <description>
         <p>1.3.4</p>

debian/changelog

@@ -1,3 +1,11 @@
+com.github.bartzaalberg.bookmark-manager (1.3.5) UNSTABLE; urgency=low
+
+  * HeaderBar is now dynamic. 
+  * Searchbar is disabled when no bookmarks are found
+  * Added a cool dynamic cancel button in the headerBar
+
+ -- Bart Zaalberg <[email protected]>  Fri, 10 Nov 2017 09:17:00 +0200
+
 com.github.bartzaalberg.bookmark-manager (1.3.4) UNSTABLE; urgency=low
 
   * fixed a bug where first screen would be empty

src/Components/BookmarkForm.vala

@@ -2,7 +2,7 @@ namespace BookmarkManager {
 public class BookmarkForm : Gtk.Grid{
 
     StackManager stackManager = StackManager.get_instance();
-    BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
 
     protected HeaderLabel general_header = new HeaderLabel ("A bookmark form");
 

src/Components/HeaderBar.vala

@@ -2,24 +2,26 @@ using Granite.Widgets;
 
 namespace BookmarkManager {
 public class HeaderBar : Gtk.HeaderBar {
+
+    static HeaderBar? instance;
 
     StackManager stackManager = StackManager.get_instance();
-    BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();    
+    ListBox listBox = ListBox.get_instance();    
     public Gtk.SearchEntry searchEntry = new Gtk.SearchEntry ();
-    Gtk.Button return_button = new Gtk.Button ();
+    public Gtk.Button return_button = new Gtk.Button ();
     Gtk.Button add_button = new Gtk.Button.from_icon_name ("document-new", Gtk.IconSize.LARGE_TOOLBAR);
     Gtk.MenuButton menu_button = new Gtk.MenuButton ();
 
-    public HeaderBar(){
-
+    HeaderBar() {
         Granite.Widgets.Utils.set_color_primary (this, Constants.BRAND_COLOR);
 
         searchEntry.set_placeholder_text("Search Bookmarks");
         searchEntry.set_tooltip_text("Search for bookmarks");
+        searchEntry.sensitive = true;
         searchEntry.search_changed.connect (() => {
             showReturnButton(false);
             showAddButton(true);
-            bookmarkListManager.getList().getBookmarks(searchEntry.text);
+            listBox.getBookmarks(searchEntry.text);
         });
 
         generateAddButton();
@@ -50,6 +52,13 @@ public class HeaderBar : Gtk.HeaderBar {
         this.pack_end (menu_button);        
         this.pack_end (searchEntry);
     }
+
+    public static HeaderBar get_instance() {
+        if (instance == null) {
+            instance = new HeaderBar();
+        }
+        return instance;
+    }
 
     private void generateMenuButton(){
         menu_button.has_tooltip = true;
@@ -75,7 +84,7 @@ public class HeaderBar : Gtk.HeaderBar {
             showReturnButton(false);
             showAddButton(true);
             stackManager.getStack().visible_child_name = "list-view";
-            bookmarkListManager.getList().getBookmarks("");
+            listBox.getBookmarks("");
         });
     }
 

src/Dialogs/DeleteConfirm.vala

@@ -1,7 +1,7 @@
 namespace BookmarkManager {
 public class DeleteConfirm : Gtk.Dialog {
 
-    private BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
     private StackManager stackManager = StackManager.get_instance();
 
 //    public DeleteConfirm(Bookmark deletedBookmark){
@@ -94,7 +94,7 @@ public class DeleteConfirm : Gtk.Dialog {
         ConfigFileReader.writeToFile(newBookmarksList); 
 
         stackManager.getStack().visible_child_name = "list-view"; 
-        bookmarkListManager.getList().getBookmarks("");  
+        listBox.getBookmarks("");  
     }
 
 

src/Dialogs/Preferences.vala

@@ -2,7 +2,7 @@ namespace BookmarkManager {
 public class Preferences : Gtk.Dialog {
 
     private Settings settings = new Settings ("com.github.bartzaalberg.bookmark-manager");
-    BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
 
     public Preferences(){
         title = "Preferences";
@@ -38,7 +38,7 @@ public class Preferences : Gtk.Dialog {
                 settings.set_string("sshname", usernameEntry.text);
             }
 
-            bookmarkListManager.getList().getBookmarks("");
+            listBox.getBookmarks("");
             this.destroy ();
         });
 

src/ListBox.vala

@@ -3,9 +3,21 @@ using Granite.Widgets;
 namespace BookmarkManager {
 public class ListBox : Gtk.ListBox{
 
+    static ListBox? instance;
+
     private ConfigFileReader configFileReader = new ConfigFileReader ();
     private StackManager stackManager = StackManager.get_instance();
 
+    ListBox() {
+    }
+
+    public static ListBox get_instance() {
+        if (instance == null) {
+            instance = new ListBox();
+        }
+        return instance;
+    }
+
     public void emptyList(){
         this.foreach ((ListBoxRow) => {
             this.remove(ListBoxRow);
@@ -15,17 +27,19 @@ public class ListBox : Gtk.ListBox{
     public void getBookmarks(string searchWord = ""){
         emptyList();
 
+        HeaderBar.get_instance().searchEntry.sensitive = true;
         stackManager.getStack().visible_child_name = "list-view";
 
         var bookmarks = configFileReader.getBookmarks();
 
         if(listisEmpty(bookmarks)) {
+            HeaderBar.get_instance().searchEntry.sensitive = false;
             stackManager.getStack().visible_child_name = "empty-view";
             return;
         }
 
         if(searchWordDoesntMatchAnyInList(searchWord, bookmarks)) {
-            stackManager.getStack().visible_child_name = "not-found-view";
+            stackManager.getStack().visible_child_name = "not-found-view";            
             return;
         }
 

src/MainWindow.vala

@@ -5,9 +5,9 @@ public class MainWindow : Gtk.Window{
 
     private Settings settings = new Settings ("com.github.bartzaalberg.bookmark-manager");
 
-    private BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
     private StackManager stackManager = StackManager.get_instance();
-    private HeaderBar headerBar = new HeaderBar();
+    private HeaderBar headerBar = HeaderBar.get_instance();
 
     construct {
         if(settings.get_string ("sshname") == ""){ 
@@ -19,7 +19,7 @@ public class MainWindow : Gtk.Window{
 
         stackManager.loadViews(this);
 
-        bookmarkListManager.getList().getBookmarks("");
+        listBox.getBookmarks("");
 
         addShortcuts();
 

src/Views/AddBookmark.vala

@@ -2,7 +2,7 @@ namespace BookmarkManager {
 public class AddBookmark : BookmarkForm{
 
     StackManager stackManager = StackManager.get_instance();
-    BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
     ConfigFileReader configFileReader = new ConfigFileReader();
 
     public AddBookmark(){
@@ -47,8 +47,7 @@ public class AddBookmark : BookmarkForm{
 
         configFileReader.writeToFile(bookmarks);
 
-        stackManager.getStack().visible_child_name = "list-view";
-        bookmarkListManager.getList().getBookmarks("");    
+        listBox.getBookmarks("");
     }
 
     public bool alreadyExists(Bookmark newBookmark, Bookmark[] bookmarks){

src/Views/EditBookmark.vala

@@ -2,7 +2,7 @@ namespace BookmarkManager {
 public class EditBookmark : BookmarkForm{
 
     StackManager stackManager = StackManager.get_instance();
-    BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
 
     public EditBookmark(){ 
 
@@ -88,8 +88,7 @@ public class EditBookmark : BookmarkForm{
 
         ConfigFileReader.writeToFile(bookmarks);
 
-        stackManager.getStack().visible_child_name = "list-view";
-        bookmarkListManager.getList().getBookmarks("");    
+        listBox.getBookmarks("");    
     }
 
     public int getCorrectBookmarkIndex(Bookmark editedBookmark, Bookmark[] bookmarks){

src/Views/ListBookmarks.vala

@@ -1,12 +1,12 @@
 namespace BookmarkManager {
 public class ListBookmarks : Gtk.ScrolledWindow {
 
-   BookmarkListManager bookmarkListManager = BookmarkListManager.get_instance();
+    private ListBox listBox = ListBox.get_instance();
 
    public ListBookmarks(){ 
 
         var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-        box.add(bookmarkListManager.getList());
+        box.add(listBox);
 
         this.hscrollbar_policy = Gtk.PolicyType.NEVER;
         this.add (box);