Removed AUTO_ENTER and AUTOCOMPLETE defines; removed more C leftovers; removed annoying indent correction that makes life impossible; removed more dead code; refactored find message

bweir · bweir · commit c40dc9518870 · 2014-12-05T03:54:50.000-08:00
diff --git a/src/propelleride/SpinParser.cpp b/src/propelleride/SpinParser.cpp
@@ -68,10 +68,6 @@ QStringList SpinParser::spinFileTree(QString file, QString libpath)
     spinFiles.append(file.mid(file.lastIndexOf("/")+1));
     QStringList keys = db.keys();
 
-#if defined(SPIN_AUTOCOMPLETE)
-    makeTags(file);
-#endif
-
     QStringList nodes;
     foreach(key, keys) {
         value = db[key];
@@ -101,34 +97,6 @@ QStringList SpinParser::spinFileTree(QString file, QString libpath)
     return spinFiles;
 }
 
-void SpinParser::makeTags(QString file)
-{
-#if 0
-    // not actually used?
-    QStringList keys = db.keys();
-
-    QString tagheader = \
-"!_TAG_FILE_FORMAT	1	/original ctags format/\n"
-"!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/\n"
-"!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/\n"
-"!_TAG_PROGRAM_NAME	Exuberant Ctags	//\n"
-"!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/\n"
-"!_TAG_PROGRAM_VERSION	5.8	//\n";
-
-    QString path = file.mid(0,file.lastIndexOf("/")+1);
-    QFile tags(path+"tags");
-    if(tags.open(QFile::WriteOnly | QFile::Text)) {
-        tags.write(tagheader.toLatin1());
-        foreach(QString key, keys) {
-            QStringList tl = db[key].split("\t");
-            QString ts = tl[0]+"\t"+tl[1]+"\t/^"+tl[2]+"$/";
-            tags.write(ts.toLatin1()+"\n");
-        }
-        tags.close();
-    }
-#endif
-}
-
 QString SpinParser::tagItem(QStringList tabs, int field)
 {
     QString s;
@@ -712,37 +680,6 @@ void SpinParser::findSpinTags (QString fileName, QString objnode)
             //qDebug() << shortFileName(fileName) << objnode << "Section " << ": " << line;
         }
 
-#if !defined(SPIN_AUTOCOMPLETE)
-        /* In Spin, keywords always are at the start of the line. */
-        SpinKind type = K_NONE;
-        KeyWord kw = spin_keywords[1]; // K_OBJECT is not 1, but OBJ keyword is.
-        line = line.trimmed();
-        QRegExp tokens("\\b(con|obj|pri|pub|dat|var)\\b");
-        tokens.setCaseSensitivity(Qt::CaseInsensitive);
-        if(line.indexOf(tokens) == 0) {
-            // if line has obj at position 0, get the type and store it
-            // else set to some other type so we stop looking for objects
-            if(line.indexOf("obj",0,Qt::CaseInsensitive) == 0)
-                type = (SpinKind) match_keyword (line.toLatin1(), &kw, tag);
-            else
-                type = this->K_CONST;
-
-            // keep state until it changes from K_NONE
-            if(type != K_NONE) {
-                state = type;
-            }
-        }
-
-        //printf ("state %d\n", state);
-        switch(state) {
-            case K_OBJECT:
-                match_object(line);
-            break;
-            default:
-                tag = "";
-            break;
-        }
-#else
         /* In Spin, keywords always are at the start of the line. */
         SpinKind type = K_NONE;
         foreach(KeyWord kw, spin_keywords) {
@@ -785,7 +722,6 @@ void SpinParser::findSpinTags (QString fileName, QString objnode)
                 tag = "";
             break;
         }
-#endif
     }
 }
 
diff --git a/src/propelleride/SpinParser.h b/src/propelleride/SpinParser.h
@@ -35,8 +35,6 @@ class SpinParser
         K_KINDS
     } SpinKind;
 
-    void makeTags(QString file);
-
     /*
      * Parse and get a spin project tree list.
      * All object instances will be listed with sub-objects.
diff --git a/src/propelleride/editor.cpp b/src/propelleride/editor.cpp
@@ -124,24 +124,19 @@ void Editor::keyPressEvent (QKeyEvent *e)
             useSpinSuggestion(key);
         }
         else {
-#ifdef ENABLE_AUTO_ENTER
-            if(autoEnterColumn() == 0)
+            if(autoIndent() == 0)
                 QPlainTextEdit::keyPressEvent(e);
-#endif
         }
     }
-#ifdef ENABLE_AUTO_ENTER
     else if(key == Qt::Key_BraceRight) {
         if(braceMatchColumn() == 0)
             QPlainTextEdit::keyPressEvent(e);;
     }
-#endif
     /* if F1 get word under mouse and pass to findSymbolHelp. no word is ok too. */
     else if(key == Qt::Key_F1) {
         contextHelp();
         QPlainTextEdit::keyPressEvent(e);
     }
-#if defined(SPIN_AUTOCOMPLETE)
 #ifdef SPIN_AUTOCON
     /* #-auto complete */
     else if(key == Qt::Key_NumberSign) {
@@ -164,7 +159,7 @@ void Editor::keyPressEvent (QKeyEvent *e)
             QPlainTextEdit::keyPressEvent(e);
         }
     }
-#endif
+
     /* if TAB key do block move */
     else if(key == Qt::Key_Tab || key == Qt::Key_Backtab) {
         if(QToolTip::isVisible() && propDialog->getSpinSuggestEnable()) {
@@ -429,7 +424,7 @@ void Editor::mouseDoubleClickEvent (QMouseEvent *e)
     mousepos = e->pos();
 }
 
-int Editor::autoEnterColumn()
+int Editor::autoIndent()
 {
     QTextCursor cur = this->textCursor();
     if(cur.selectedText().length() > 0) {
@@ -446,18 +441,6 @@ int Editor::autoEnterColumn()
     QRegExp sections("\\b(con|dat|pub|pri|obj|var)\\b");
     sections.setCaseSensitivity(Qt::CaseInsensitive);
 
-    if((text.length() == 0 && col == 0) || text.indexOf(sections) == 0) {
-        cur.beginEditBlock();
-        cur.insertBlock();
-        for(int n = propDialog->getTabSpaces(); n > 0; n--) {
-            cur.insertText(" ");
-        }
-        this->setTextCursor(cur);
-        /* end a single undo/redo operation */
-        cur.endEditBlock();
-        return 1;
-    }
-
     // handle indent for spin
     int stop = -1;
     int indent = -1;
diff --git a/src/propelleride/editor.h b/src/propelleride/editor.h
@@ -41,7 +41,7 @@ class Editor : public QPlainTextEdit
     inline void setCodeType(CodeType type)  { codeType = type; }
 
 private:
-    int  autoEnterColumn();
+    int  autoIndent();
     int  braceMatchColumn();
     bool isCommentOpen(int line);
     bool isSpinCommentOpen(int line);
diff --git a/src/propelleride/mainwindow.h b/src/propelleride/mainwindow.h
@@ -198,6 +198,7 @@ public slots:
     QPushButton *regexButton;
     QString     findText;
     QString     replaceText;
+    bool        showFindMessage(QString type);
     
     QHBoxLayout *findLayout;
     QLineEdit   *findEdit;
diff --git a/src/propelleride/mainwindow/find.cpp b/src/propelleride/mainwindow/find.cpp
@@ -25,7 +25,7 @@ QFrame *MainWindow::newFindFrame(QSplitter *split)
     findLayout->setContentsMargins(11, 11, 11, 11);
     findLayout->setObjectName(QStringLiteral("findLayout"));
     findLayout->setContentsMargins(4, 4, 4, 0);
-    
+
     /* "Find:" */
     findLabel = new QLabel();
     findLabel->setObjectName(QStringLiteral("findLabel"));
@@ -48,37 +48,37 @@ QFrame *MainWindow::newFindFrame(QSplitter *split)
     findPreviousBtn = new QToolButton();
     findPreviousBtn->setObjectName(QStringLiteral("findPreviousBtn"));
     findPreviousBtn->setStyleSheet("QToolButton {\
-                                        background: url(:/icons/find-previous.png) center no-repeat;\
-                                        width: 24;\
-                                        height: 24;\
-                                        border-width: 0;\
-                                        border: none;\
-                                    }\
-                                    QToolButton:pressed {\
-                                        background: url(:/icons/find-previous-pressed.png) center no-repeat;\
-                                        border-width: 0;\
-                                        border: none;\
-                                    }\
-                                ");
+        background: url(:/icons/find-previous.png) center no-repeat;\
+            width: 24;\
+            height: 24;\
+            border-width: 0;\
+            border: none;\
+        }\
+        QToolButton:pressed {\
+        background: url(:/icons/find-previous-pressed.png) center no-repeat;\
+        border-width: 0;\
+        border: none;\
+    }\
+    ");
     findLayout->addWidget(findPreviousBtn);
     connect(findPreviousBtn,SIGNAL(clicked()),this,SLOT(findPrevClicked()));
 
     /* find-next button */
     findNextBtn = new QToolButton();
     findNextBtn->setObjectName(QStringLiteral("findNextBtn"));
     findNextBtn->setStyleSheet("QToolButton {\
-                                    background: url(:/icons/find-next.png) center no-repeat;\
-                                    width: 24;\
-                                    height: 24;\
-                                    border-width: 0;\
-                                    border: none;\
-                                }\
-                                QToolButton:pressed {\
-                                    background: url(:/icons/find-next-pressed.png) center no-repeat;\
-                                    border-width: 0;\
-                                    border: none;\
-                                }\
-                            ");
+        background: url(:/icons/find-next.png) center no-repeat;\
+            width: 24;\
+            height: 24;\
+            border-width: 0;\
+            border: none;\
+        }\
+        QToolButton:pressed {\
+        background: url(:/icons/find-next-pressed.png) center no-repeat;\
+        border-width: 0;\
+        border: none;\
+    }\
+    ");
     findLayout->addWidget(findNextBtn);
     connect(findNextBtn,SIGNAL(clicked()),this,SLOT(findNextClicked()));
 
@@ -150,7 +150,7 @@ QFrame *MainWindow::newFindFrame(QSplitter *split)
     replaceAllBtn->setObjectName(QStringLiteral("replaceAllBtn"));
     replaceLayout->addWidget(replaceAllBtn);
     connect(replaceAllBtn,SIGNAL(clicked()),this,SLOT(replaceAllClicked()));
-    
+
     /* add replace feature to the layout */
     verticalLayout->addLayout(replaceLayout);
 
@@ -199,13 +199,8 @@ void MainWindow::showFindFrame()
         clearFindText();
     }
 
-    if (findFrame->isVisible()) {
-       findFrame->setVisible(false);
-    }
-    else {
-        findEdit->setFocus();
-        findFrame->setVisible(true);
-    }
+    findEdit->setFocus();
+    findFrame->setVisible(true);
 }
 
 void MainWindow::hideFindFrame()
@@ -373,12 +368,6 @@ void MainWindow::findPrevClicked()
 
     if(count > 0) {
         QTextCursor cur = editor->textCursor();
-        // the following code was setting the cursor left by 1
-        //int len = cur.selectedText().length();
-        //cur.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor);
-        //cur.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor);
-        //cur.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor,len);
-        //editor->setTextCursor(cur);
         findPosition = editor->textCursor().position();
     }
 }
@@ -407,9 +396,7 @@ void MainWindow::replaceClicked()
         hide();
     }
 }
-/*
- * If find text is highlighted, replace and find again.
- */
+
 void MainWindow::replaceNextClicked()
 {
     Editor *editor = getEditor(editorTabs->currentIndex());
@@ -427,9 +414,6 @@ void MainWindow::replaceNextClicked()
     }
 }
 
-/*
- * If find text is highlighted, replace and find again.
- */
 void MainWindow::replacePrevClicked()
 {
     Editor *editor = getEditor(editorTabs->currentIndex());
@@ -485,7 +469,7 @@ void MainWindow::replaceAllClicked()
     editor->textCursor().endEditBlock();
 
     QMessageBox::information(this, tr("Replace Done"),
-        tr("Replaced %1 instances of \"%2\".").arg(count).arg(text));
+            tr("Replaced %1 instances of \"%2\".").arg(count).arg(text));
 }
 
 QString MainWindow::getReplaceText()
@@ -497,11 +481,15 @@ void MainWindow::clearReplaceText()
     replaceEdit->clear();
 }
 
-bool MainWindow::showBeginMessage(QString type)
+
+bool MainWindow::showFindMessage(QString text)
 {
-    QMessageBox::StandardButton ret = QMessageBox::information(
-        this, type, type+tr(" from beginning?"),
-        QMessageBox::Cancel, QMessageBox::Ok);
+    QMessageBox msgBox;
+    msgBox.setText(text);
+    msgBox.setStandardButtons(QMessageBox::Cancel | QMessageBox::Ok);
+    msgBox.setDefaultButton(QMessageBox::Ok);
+    int ret = msgBox.exec();
+
     if(ret == QMessageBox::Cancel) {
         return false;
     }
@@ -514,19 +502,12 @@ bool MainWindow::showBeginMessage(QString type)
     return true;
 }
 
+bool MainWindow::showBeginMessage(QString type)
+{
+    return showFindMessage(type+tr(" from beginning?"));
+}
+
 bool MainWindow::showEndMessage(QString type)
 {
-    QMessageBox::StandardButton ret = QMessageBox::information(
-        this, type, type+tr(" from end?"),
-        QMessageBox::Cancel, QMessageBox::Ok);
-    if(ret == QMessageBox::Cancel) {
-        return false;
-    }
-    Editor *editor = getEditor(editorTabs->currentIndex());
-    if(editor == NULL)
-        return false;
-    QTextCursor cur = editor->textCursor();
-    cur.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
-    editor->setTextCursor(cur);
-    return true;
+    return showFindMessage(type+tr(" from end?"));
 }
diff --git a/src/propelleride/propelleride.pro b/src/propelleride/propelleride.pro
@@ -77,8 +77,3 @@ win32 {
     LIBS            += -L$$PWD -lz
     RC_FILE         = propelleride.rc
 }
-
-# ENABLE_AUTO_ENTER turns on AUTO-INDENT
-DEFINES += ENABLE_AUTO_ENTER
-# SPIN_AUTOCOMPLETE turns on spinny-sense
-DEFINES += SPIN_AUTOCOMPLETE

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,3 @@ win32 {`
`77`	`77`	`LIBS += -L$$PWD -lz`
`78`	`78`	`RC_FILE = propelleride.rc`
`79`	`79`	`}`
`80`		`-`
`81`		`-# ENABLE_AUTO_ENTER turns on AUTO-INDENT`
`82`		`-DEFINES += ENABLE_AUTO_ENTER`
`83`		`-# SPIN_AUTOCOMPLETE turns on spinny-sense`
`84`		`-DEFINES += SPIN_AUTOCOMPLETE`