Revision n1

elokab-terminal/main.cpp

@@ -18,6 +18,8 @@ void helpMe()
     puts(" -b, --hide-border                                      FramelessWindow no border\n");
     puts(" -t, --on-top                                           On top hint\n");
     puts(" -g, --geometry           <left,top,width,height>       Run in specific dimensions ex: 0,0,800,600 \n");
+    puts(" -o, --opacity            <int>                       Window opacity 0 to 100 \n");
+
 }
 
 
@@ -71,7 +73,7 @@ int main(int argc, char *argv[])
     bool framless=false;
     bool ontop=false;
     QStringList args = a.arguments();
-
+    int opacity=-1;
     if(args.count()>1)
     {
 
@@ -102,6 +104,12 @@ int main(int argc, char *argv[])
 
             else if (arg == "-t" || arg == "--on-top" ) {ontop=true;}
 
+            else if (arg == "-o" || arg == "--opacity" ) {
+                if(i+1>args.count()-1){helpMe();return 0;}
+                opacity=args.at(i+1).toInt();
+
+            }
+
 
                     // qWarning() << "echo Unknown option: " << args;  helpMe(); return 0;
                    // command= "echo \"Unknown option: " + arg+"\n"+ help+"\"";
@@ -129,9 +137,10 @@ int main(int argc, char *argv[])
               <<"\n Workdir: "<<workdir
               <<"\n Command: "<<command
               <<"\n Framless:"<<framless
-              <<"\n Geometry:"<<geometry;
+              <<"\n Geometry:"<<geometry
+              <<"\n Opacity:"<<opacity;
 
-    MainWindow w(workdir,command,framless,geometry,ontop);
+    MainWindow w(workdir,command,framless,geometry,ontop,opacity);
 
 
     w.show();

elokab-terminal/mainwindow.cpp

@@ -16,7 +16,7 @@ MainWindow::MainWindow(const QString &wDir,
                        const QString &command,
                        bool framless,
                        const QString &geometry,
-                       bool ontop,
+                       bool ontop,int opacity,
                        QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow)
@@ -44,9 +44,11 @@ MainWindow::MainWindow(const QString &wDir,
         int _h=QString(list.at(3)).toInt();
         qDebug()<<"MainWindow Geometry:"<<_x<<_y<<_w<<_h;
         setGeometry(_x,_y,_w,_h);
+        mSaveGeometry=false;
     }else{
         QSettings setting;
         restoreGeometry(setting.value("Geometry").toByteArray());
+           mSaveGeometry=true;
     }
 
 
@@ -58,14 +60,16 @@ MainWindow::MainWindow(const QString &wDir,
     connect(ui->tabWidget,SIGNAL(tabCloseRequested(int)),this,SLOT(closeTab(int)));
     connect(ui->tabWidget,SIGNAL(currentChanged(int)),this,SLOT(tabChanged(int)));
     clipboardChanged();
-    addNewTab(wDir,command);
+    addNewTab(wDir,command,opacity);
 
 }
 
 MainWindow::~MainWindow()
 {
-    QSettings setting;
-    setting.setValue("Geometry",saveGeometry());
+    if(mSaveGeometry){
+        QSettings setting;
+        setting.setValue("Geometry",saveGeometry());
+    }
 
     delete ui;
 }
@@ -223,7 +227,7 @@ void MainWindow::customContextMenu(QPoint)
     mMenu->exec(QCursor::pos());
 }
 
-void MainWindow::addNewTab(const QString &wDir, const QString &command)
+void MainWindow::addNewTab(const QString &wDir, const QString &command,int opacity)
 {
 
 
@@ -245,7 +249,12 @@ void MainWindow::addNewTab(const QString &wDir, const QString &command)
 //        font=QApplication::font().family();
 //    }
     int spos=setting.value("ScrollBar",0).toInt();
-    int opacity=setting.value("Opacity",100).toInt();
+qDebug()<<"opacity"<<opacity;
+
+    if(opacity==-1)
+       opacity=setting.value("Opacity",100).toInt();
+
+
     QString shell=setting.value("Shell",QString()).toString();
     int cursorShape=setting.value("CursorShape",0).toInt();
 
@@ -307,12 +316,13 @@ QTermWidget *MainWindow::termWidget()
     QTermWidget   *w= qobject_cast<QTermWidget *>( ui->tabWidget->currentWidget());
     if(w)
         return w;
-    return 0;
+    return nullptr;
 
 }
 
 void MainWindow::closeTab(int index)
 {
+    Q_UNUSED(index);
     QSettings setting;
     bool checked= setting.value("CloseMsg",true).toBool();
     if(checked){

elokab-terminal/mainwindow.h

@@ -18,7 +18,8 @@ class MainWindow : public QMainWindow
                         bool framless=false,
                         const QString &geometry=QString(),
                         bool ontop=false,
-                        QWidget *parent = 0);
+                        int opacity=-1,
+                        QWidget *parent = nullptr);
     ~MainWindow();
     void closeEvent(QCloseEvent *event);
 signals:
@@ -38,7 +39,7 @@ private slots:
 
     void customContextMenu(QPoint);
     void addNewTab(const QString &wDir=QDir::homePath(),
-                   const QString &command=QString());
+                   const QString &command=QString(), int opacity=-1);
 
     void changeTitle(const QString &txt);
 
@@ -68,7 +69,7 @@ private slots:
     QAction *mActQuit;
 
     QMenu *mMenu;
-
+bool mSaveGeometry=true;
 
 };
 

elokab-terminal/settingdialog.ui

@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
@@ -195,7 +195,7 @@
             <item>
              <widget class="QSlider" name="horizontalSlider">
               <property name="minimum">
-               <number>10</number>
+               <number>0</number>
               </property>
               <property name="maximum">
                <number>100</number>