Tune page:: all options tabs are scrollable now

aerowolf · Aug 26, 2016 · 240f6f0 · 240f6f0
1 parent 19e842f
commit 240f6f0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 42 deletions.
diff --git a/hls/lua.xml b/hls/lua.xml
@@ -4,38 +4,11 @@
 </item>
 
 <item name="keywords" type="keywords" color="keywords" fontstyle="bold">\b(and|break|do|else|
-elseif|end|false|for|function|if|in|local|nil|not|or|repeat|
-return|then|true|until|while)\b</item>
-
-<item name="functions" type="keywords" color="functions">\b(assert|
-\bcollectgarbage\b;
-\bdofile\b;
-\berror\b;
-\b_G\b;
-\bgetenv\b;
-\bgetmetatable\b;
-\bipairs\b;
-\bload\b;
-\bloadfile\b;
-\bloadstring\b;
-\bnext\b;
-\bpairs\b;
-\bpcall\b;
-\bprint\b;
-\brawequal\b;
-\brawget\b;
-\brawset\b;
-\bselect\b;
-\bsetfenv\b;
-\bsetmetatable\b;
-\btonumber\b;
-\btostring\b;
-\btype\b;
-\bunpack\b;
-\b_VERSION\b;
-\bxpcall\b;
-\bmodule\b;
-\brequire\b</item>
+elseif|end|false|for|function|if|in|local|nil|not|or|repeat|return|then|true|until|while)\b</item>
+
+<item name="functions" type="keywords" color="functions">\b(assert|collectgarbage|dofile|error|
+_G|getenv|getmetatable|ipairs|load|loadfile|loadstring|next|pairs|pcall|print|rawequal|rawget|rawset|select|setfenv|setmetatable|tonumber|
+tostring|type|unpack|_VERSION|xpcall|module|require)\b</item>
 
 <item name="preproc" type="item" color="preproc" fontstyle="italic">^#.*</item>
 

diff --git a/rvln.cpp b/rvln.cpp
@@ -2571,7 +2571,15 @@ void rvln::createOptions()
   page_interface->setLayout (page_interface_layout);
   page_interface->show();
 
-  tab_options->addTab (page_interface, tr ("Interface"));
+
+  QScrollArea *scra_interface = new QScrollArea;
+  scra_interface->setWidgetResizable (true);
+  scra_interface->setWidget (page_interface);
+
+  tab_options->addTab (scra_interface, tr ("Interface"));
+
+
+  //tab_options->addTab (page_interface, tr ("Interface"));
 
   //////////
 
@@ -2782,7 +2790,15 @@ void rvln::createOptions()
   page_common->setLayout (page_common_layout);
   page_common->show();
 
-  tab_options->addTab (page_common, tr ("Common"));
+
+  QScrollArea *scra_common = new QScrollArea;
+  scra_common->setWidgetResizable (true);
+  scra_common->setWidget (page_common);
+
+  tab_options->addTab (scra_common, tr ("Common"));
+
+//  tab_options->addTab (page_common, tr ("Common"));
+
 
   QWidget *page_functions = new QWidget (tab_options);
   QVBoxLayout *page_functions_layout = new QVBoxLayout;
@@ -2899,13 +2915,13 @@ void rvln::createOptions()
   page_functions->setLayout (page_functions_layout);
   page_functions->show();
 
-  //QScrollArea *scra_functions = new QScrollArea;
-  //scra_functions->setWidgetResizable (true);
-  //scra_functions->setWidget (page_functions);
+  QScrollArea *scra_functions = new QScrollArea;
+  scra_functions->setWidgetResizable (true);
+  scra_functions->setWidget (page_functions);
 
-  //tab_options->addTab (scra_functions, tr ("Functions"));
+  tab_options->addTab (scra_functions, tr ("Functions"));
 
-  tab_options->addTab (page_functions, tr ("Functions"));
+  //tab_options->addTab (page_functions, tr ("Functions"));
 
 /////////////
 
@@ -2980,10 +2996,14 @@ void rvln::createOptions()
 
 
 
+  QScrollArea *scra_images = new QScrollArea;
+  scra_images->setWidgetResizable (true);
+  scra_images->setWidget (page_images);
+
+  tab_options->addTab (scra_common, tr ("Images"));
+
 
-
-
-  tab_options->addTab (page_images, tr ("Images"));
+//  tab_options->addTab (page_images, tr ("Images"));
 ////////////////////////////
 
   QWidget *page_keyboard = new QWidget (tab_options);