projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5a134d)
some modest improvements in the html rendering of key bindings, plus use of normal...
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 20 Jun 2016 21:19:23 +0000 (17:19 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 20 Jun 2016 21:19:31 +0000 (17:19 -0400)
libs/gtkmm2ext/bindings.cc patch | blob | history
libs/gtkmm2ext/gtkmm2ext/bindings.h patch | blob | history

diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc
index d06a3a28c1ed3d97ba6ca55f9e2456a6a66cd82b..3dbc3c030298b7554dad6d6b4e25fd5bf3fed476 100644 (file)
--- a/libs/gtkmm2ext/bindings.cc
+++ b/libs/gtkmm2ext/bindings.cc
@@ -234,6 +234,51 @@ KeyboardKey::name () const
        return str;
 }
 
+string
+KeyboardKey::native_name () const
+{
+       int s = state();
+
+       string str;
+
+       if (s & Keyboard::PrimaryModifier) {
+               str += Keyboard::primary_modifier_name ();
+       }
+       if (s & Keyboard::SecondaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::secondary_modifier_name ();
+       }
+       if (s & Keyboard::TertiaryModifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::tertiary_modifier_name ();
+       }
+       if (s & Keyboard::Level4Modifier) {
+               if (!str.empty()) {
+                       str += '-';
+               }
+               str += Keyboard::level4_modifier_name ();
+       }
+
+       if (!str.empty()) {
+               str += '-';
+       }
+
+       char const *gdk_name = gdk_keyval_name (key());
+
+       if (gdk_name) {
+               str += gdk_name;
+       } else {
+               /* fail! */
+               return string();
+       }
+
+       return str;
+}
+
 bool
 KeyboardKey::make_key (const string& str, KeyboardKey& k)
 {
@@ -683,30 +728,66 @@ Bindings::save_all_bindings_as_html (ostream& ostr)
                return;
        }
 
-       ostr << "<http>\n<head>\n<title>";
+
+       ostr << "<html>\n<head>\n<title>";
        ostr << PROGRAM_NAME;
-       ostr << "</title>\n</head>\n<body>\n";
+       ostr << "</title>\n";
+
+
+       ostr << "<style>\n";
+       ostr << ".container {\n\
+   -webkit-column-count: 3;\n\
+      -moz-column-count: 3;\n\
+           column-count: 3;\n\
+\n\
+   -webkit-column-gap: 8em;\n\
+      -moz-column-gap: 8em;\n\
+           column-gap: 8em;\n\
+}";
+       ostr << "\n\
+.container dt\n\
+{\n\
+    clear: left;\n\
+    float: left;\n\
+    width: 25%;\n\
+    margin: 0;\n\
+    padding: 5px;\n\
+    font-weight: bold;\n\
+}\n\
+\n\
+.container dd\n\
+{\n\
+    float: left;\n\
+    width: 65%;\n\
+    margin: 0;\n\
+    padding: 5px;\n\
+    font-weight: normal;\n\
+    font-style: italic;\n\
+}";
+       ostr << "</style>\n";
+
+       ostr << "</head>\n<body>\n";
+
+       ostr << "<div class=\"container\">\n";
 
        for (list<Bindings*>::const_iterator b = bindings.begin(); b != bindings.end(); ++b) {
                (*b)->save_as_html (ostr);
        }
 
+       ostr << "</div>\n";
        ostr << "</body>\n";
-       ostr << "</http>\n";
+       ostr << "</html>\n";
 }
 
 void
 Bindings::save_as_html (ostream& ostr) const
 {
-       ostr << "<h1 class=\"binding-set-name\">";
-       ostr << name();
-       ostr << "</h1>\n";
 
        if (!press_bindings.empty() || !button_press_bindings.empty()) {
 
-               ostr << "<h2 class=\"action-title\">";
-               ostr << _("Press");
-               ostr << "</h2>\n";
+               ostr << "<h1 class=\"binding-set-name\">";
+               ostr << name();
+               ostr << "</h1>\n";
 
                if (!press_bindings.empty()) {
 
@@ -731,7 +812,7 @@ Bindings::save_as_html (ostream& ostr) const
                                        continue;
                                }
 
-                               ostr << "<dt class=\"key-name\">" << k->first.name() << "</dt>\n";
+                               ostr << "<dt class=\"key-name\">" << k->first.native_name() << "</dt>\n";
                                ostr << "<dd class=\"key-action\">" << action->get_label() << "</dd>\n";
                        }
 
@@ -741,10 +822,6 @@ Bindings::save_as_html (ostream& ostr) const
 
        if (!release_bindings.empty() || !release_bindings.empty()) {
 
-               ostr << "<h2 class=\"action-title\">";
-               ostr << _("Release");
-               ostr << "</h2>\n";
-
                if (!release_bindings.empty()) {
                        ostr << "<dl class=\"key-binding\">\n";
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/bindings.h b/libs/gtkmm2ext/gtkmm2ext/bindings.h
index c2a5215a68315081cb6ea61f1fd1e1a74b280ff5..3462f102ea0a53f2279e651d068a498f3bc4fa15 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/bindings.h
+++ b/libs/gtkmm2ext/gtkmm2ext/bindings.h
@@ -43,6 +43,7 @@ class LIBGTKMM2EXT_API KeyboardKey
        }
 
        std::string name() const;
+       std::string native_name() const;
        static bool make_key (const std::string&, KeyboardKey&);
 
        std::string display_label() const;
Unnamed repository; edit this file 'description' to name the repository.