3 files changed, 20 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 1139bfa..1b84dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 (Format: Year/Month/Day)
 Changes for 0.9.10:
 *04/08/26:
+  * Tiny unification (Mathias)
+    - theme.cfg and style.cfg allowed
+    - in menufiles:
+        [stylesdir] and [themesdir] allowed
+        [stylesmenu] and [themesmenu] allowed
   * Fix bevel on solid colour textures (Simon)
     FbTk/Texture.hh/cc FbTk/ThemeItems.hh
   * Make arrow in toolbar buttons scalable size (Simon)
diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index 066f9fa..e557d29 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Theme.cc,v 1.27 2004/06/07 11:46:05 rathnor Exp $
+// $Id: Theme.cc,v 1.28 2004/08/26 18:26:39 akir Exp $
 
 #include "Theme.hh"
 
@@ -88,8 +88,12 @@ bool ThemeManager::load(const std::string &filename, int screen_num) {
 
         location.append("/theme.cfg");
         if (!Directory::isRegularFile(location)) {
-            cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
-            return false;
+            location = prefix;
+            location.append("/style.cfg");
+            if (!Directory::isRegularFile(location)) {
+                cerr<<"Error loading theme file "<<location<<": not a regular file"<<endl;
+                return false;
+            }
         }
     } else {
         // dirname
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 57ef32c..374411d 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: MenuCreator.cc,v 1.10 2004/07/05 09:27:04 fluxgen Exp $
+// $Id: MenuCreator.cc,v 1.11 2004/08/26 18:26:39 akir Exp $
 
 #include "MenuCreator.hh"
 
@@ -83,7 +83,8 @@ static void createStyleMenu(FbTk::Menu &parent, const std::string &label,
         if ((FbTk::Directory::isRegularFile(style) &&
              (filelist[file_index][0] != '.') &&
              (style[style.length() - 1] != '~')) ||
-            FbTk::Directory::isRegularFile(style + "/theme.cfg"))
+            FbTk::Directory::isRegularFile(style + "/theme.cfg") ||
+            FbTk::Directory::isRegularFile(style + "/style.cfg"))
             parent.insert(new StyleMenuItem(filelist[file_index], style));
     } 
     // update menu graphics
@@ -219,6 +220,11 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem) {
         createStyleMenu(menu, str_label, 
                         str_key == "stylesmenu" ? str_cmd : str_label);
     } // end of stylesdir
+    else if (str_key == "themesdir" || str_key == "themesmenu") {
+        createStyleMenu(menu, str_label, 
+                        str_key == "themesmenu" ? str_cmd : str_label);
+    } // end of themesdir
+
     else if (str_key == "workspaces") {
         BScreen *screen = Fluxbox::instance()->findScreen(screen_number);
         if (screen != 0) {