Merge pull request #98 from deviantfero/select-multiple-files

Select multiple files
deviantfero · Jun 5, 2018 · 286e1ef · 286e1ef
2 parents 181c1f0 + 9cbb356
commit 286e1ef
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/wpgtk/__init__.py b/wpgtk/__init__.py
@@ -2,7 +2,13 @@
 wpgtk: An easy to use, colorscheme generator and wallpaper manager.
 """
 from .data.config import __version__
+from . import data
+from . import gui
+from . import misc
 
 __all__ = [
+    "data",
+    "gui",
+    "misc",
     "__version__",
 ]
diff --git a/wpgtk/__main__.py b/wpgtk/__main__.py
@@ -3,6 +3,7 @@
 import pywal
 import logging
 import argparse
+import glob
 from os import path
 from subprocess import Popen
 from .data import files
@@ -186,7 +187,7 @@ def process_args(args):
     if args.a:
         add_action = files.add_template if args.x \
                      else themer.create_theme
-        any(add_action(x) for x in args.a)
+        any(add_action(glob.glob(x)[0]) for x in args.a)
         exit(0)
 
     if args.c:

diff --git a/wpgtk/data/color.py b/wpgtk/data/color.py
@@ -175,7 +175,7 @@ def prepare_colors(cdic):
         print(config.wpgtk.getint('active'))
         bc = cl[config.wpgtk.getint('active')]
     else:
-        bc = cl[randint(0, 15)]
+        bc = cl[randint(9, 14)]
 
     wpcol['COLORACT'], wpcol['COLORIN'] = split_active(bc, is_dark_theme(cl))
     cdic['icons'] = prepare_icon_colors(cdic)

diff --git a/wpgtk/gui/template_grid.py b/wpgtk/gui/template_grid.py
@@ -76,17 +76,18 @@ def on_add_clicked(self, widget):
                                              Gtk.STOCK_OPEN,
                                              Gtk.ResponseType.OK))
         filefilter = Gtk.FileFilter()
+        filechooser.set_select_multiple(True)
         filefilter.set_name("Text")
         filefilter.add_mime_type("text/*")
         filechooser.add_filter(filefilter)
         response = filechooser.run()
 
         if response == Gtk.ResponseType.OK:
-            filepath = filechooser.get_filename()
-            files.add_template(filepath)
-            self.item_names = [filen for filen in
+            for f in filechooser.get_filenames():
+                files.add_template(f)
+            self.item_names = [f for f in
                                files.get_file_list(config.OPT_DIR, False)
-                               if '.base' in filen]
+                               if '.base' in f]
             self.liststore = Gtk.ListStore(Pixbuf, str)
             for filen in self.item_names:
                 pixbuf = Gtk.IconTheme.get_default().load_icon(icon, 64, 0)

diff --git a/wpgtk/gui/theme_picker.py b/wpgtk/gui/theme_picker.py
@@ -108,6 +108,7 @@ def on_add_clicked(self, widget):
                       (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
                        Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
 
+        filechooser.set_select_multiple(True)
         filefilter = Gtk.FileFilter()
         filefilter.set_name("Images")
         filefilter.add_mime_type("image/png")
@@ -117,7 +118,8 @@ def on_add_clicked(self, widget):
         response = filechooser.run()
 
         if response == Gtk.ResponseType.OK:
-            themer.create_theme(filechooser.get_filename())
+            for f in filechooser.get_filenames():
+                themer.create_theme(f)
             option_list = Gtk.ListStore(str)
             for elem in list(files.get_file_list()):
                 option_list.append([elem])