From 62b10381b0a0a5af921f1119b1a42b815ccd8b88 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 6 Mar 2018 10:47:25 -0500
Subject: A few final tweaks for lumina-pdf before syncing with TrueOS ports.
 Make sure the features still in development are disabled if the internal
 "TESTING" flag is not set.

---
 src-qt5/desktop-utils/lumina-pdf/mainUI.cpp | 21 +++++++++++++++------
 src-qt5/desktop-utils/lumina-pdf/mainUI.ui  |  8 +++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'src-qt5')

diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
index aecf01ac..01221309 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
@@ -210,14 +210,23 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){
   ui->findGroup->setVisible(false);
   ui->bookmarksFrame->setVisible(false);
 
+  //TESTING features/functionality
   ui->actionSettings->setEnabled(TESTING);
   ui->actionSettings->setVisible(TESTING);
-	ui->actionBookmarks->setEnabled(TESTING);
-	ui->actionBookmarks->setVisible(TESTING);
-	ui->actionScroll_Mode->setEnabled(TESTING);
-	ui->actionScroll_Mode->setVisible(TESTING);
-	ui->actionSelect_Mode->setEnabled(TESTING);
-	ui->actionSelect_Mode->setVisible(TESTING);
+  ui->actionBookmarks->setEnabled(TESTING);
+  ui->actionBookmarks->setVisible(TESTING);
+  ui->actionScroll_Mode->setEnabled(TESTING);
+  ui->actionScroll_Mode->setVisible(TESTING);
+  ui->actionSelect_Mode->setEnabled(TESTING);
+  ui->actionSelect_Mode->setVisible(TESTING);
+  ui->actionProperties->setEnabled(TESTING);
+  ui->actionProperties->setVisible(TESTING);
+  ui->menuSettings->setEnabled(TESTING);
+  ui->menuSettings->setVisible(TESTING);
+  if(!TESTING){
+    ui->menubar->removeAction(ui->menuSettings->menuAction() );
+  }
+
 }
 
 MainUI::~MainUI(){
diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.ui b/src-qt5/desktop-utils/lumina-pdf/mainUI.ui
index 0e9bfcc0..e8b07c26 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.ui
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.ui
@@ -178,9 +178,12 @@
      <x>0</x>
      <y>0</y>
      <width>697</width>
-     <height>21</height>
+     <height>38</height>
     </rect>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::CustomContextMenu</enum>
+   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>&amp;File</string>
@@ -240,6 +243,9 @@
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QToolBar" name="toolBar">
+   <property name="contextMenuPolicy">
+    <enum>Qt::CustomContextMenu</enum>
+   </property>
    <property name="windowTitle">
     <string>toolBar</string>
    </property>
-- 
cgit