src:add more shortcut

Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>

Author: QQxiaoming

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - 快速连接支持选择仅打开会话和仅保存会话
 - 改进书签管理功能
+- 实现保存设置和自动保存设置按钮功能
+- 增加ALT+'-'、ALT+'='、ALT+LEFT、ALT+RIGHT四个实用全局快捷键
 
 ## [[V0.2.1](https://github.com/QQxiaoming/quardCRT/releases/tag/V0.2.1)] - 2023-10-19
 

lib/qtermwidget/BlockArray.cpp

@@ -151,7 +151,6 @@ const Block * BlockArray::at(size_t i)
     }
 
 //     if (index - i >= length) {
-//         kDebug(1211) << "BlockArray::at() index - i >= length\n";
 //         return 0;
 //     }
 
@@ -201,8 +200,6 @@ bool BlockArray::setSize(size_t newsize)
 
 bool BlockArray::setHistorySize(size_t newsize)
 {
-//    kDebug(1211) << "setHistorySize " << size << " " << newsize;
-
     if (size == newsize) {
         return false;
     }

lib/qtermwidget/CharacterColor.h

@@ -26,9 +26,6 @@
 // Qt
 #include <QColor>
 
-//#include <kdemacros.h>
-#define KDE_NO_EXPORT
-
 namespace Konsole
 {
 
@@ -108,7 +105,7 @@ class ColorEntry
 //a standard set of colors using black text on a white background.
 //defined in TerminalDisplay.cpp
 
-extern const ColorEntry base_color_table[TABLE_COLORS] KDE_NO_EXPORT;
+extern const ColorEntry base_color_table[TABLE_COLORS];
 
 /* CharacterColor is a union of the various color spaces.
 

lib/qtermwidget/ColorScheme.cpp

@@ -34,14 +34,6 @@
 #include <QRandomGenerator>
 #include <QStringView>
 
-// KDE
-//#include <KColorScheme>
-//#include <KConfig>
-//#include <KLocale>
-//#include <KDebug>
-//#include <KConfigGroup>
-//#include <KStandardDirs>
-
 using namespace Konsole;
 
 const ColorEntry ColorScheme::defaultTable[TABLE_COLORS] =
@@ -521,18 +513,6 @@ QList<const ColorScheme*> ColorSchemeManager::allColorSchemes()
 
     return _colorSchemes.values();
 }
-#if 0
-void ColorSchemeManager::addColorScheme(ColorScheme* scheme)
-{
-    _colorSchemes.insert(scheme->name(),scheme);
-
-    // save changes to disk
-    QString path = KGlobal::dirs()->saveLocation("data","konsole/") + scheme->name() + ".colorscheme";
-    KConfig config(path , KConfig::NoGlobals);
-
-    scheme->write(config);
-}
-#endif
 
 bool ColorSchemeManager::loadCustomColorScheme(const QString& path)
 {
@@ -619,7 +599,6 @@ bool ColorSchemeManager::deleteColorScheme(const QString& name)
 }
 QString ColorSchemeManager::findColorSchemePath(const QString& name) const
 {
-//    QString path = KStandardDirs::locate("data","konsole/"+name+".colorscheme");
     const QStringList dirs = get_color_schemes_dirs();
     if ( dirs.isEmpty() )
         return QString();
@@ -629,7 +608,6 @@ QString ColorSchemeManager::findColorSchemePath(const QString& name) const
     if ( !path.isEmpty() )
         return path;
 
-    //path = KStandardDirs::locate("data","konsole/"+name+".schema");
     path = dir + QLatin1Char('/')+ name + QLatin1String(".schema");
 
     return path;

lib/qtermwidget/ColorScheme.h

@@ -254,15 +254,6 @@ class ColorSchemeManager
      */
     const ColorScheme* findColorScheme(const QString& name);
 
-#if 0
-    /**
-     * Adds a new color scheme to the manager.  If @p scheme has the same name as
-     * an existing color scheme, it replaces the existing scheme.
-     *
-     * TODO - Ensure the old color scheme gets deleted
-     */
-    void addColorScheme(ColorScheme* scheme);
-#endif
     /**
      * Deletes a color scheme.  Returns true on successful deletion or false otherwise.
      */

lib/qtermwidget/ColorTables.h

@@ -3,8 +3,9 @@
 
 #include "CharacterColor.h"
 
-//using namespace Konsole;
 #if 0
+using namespace Konsole;
+
 static const ColorEntry whiteonblack_color_table[TABLE_COLORS] = {
     // normal
     ColorEntry(QColor(0xFF,0xFF,0xFF), false ), ColorEntry( QColor(0x00,0x00,0x00), true ), // Dfore, Dback

lib/qtermwidget/Emulation.cpp

@@ -19,29 +19,21 @@
     02110-1301  USA.
 */
 
-// Own
 #include "Emulation.h"
 
-// System
 #include <cstdio>
 #include <cstdlib>
 #include <unistd.h>
 #include <string>
 
-// Qt
 #include <QApplication>
 #include <QClipboard>
 #include <QHash>
 #include <QKeyEvent>
 #include <QTextStream>
 #include <QThread>
-
 #include <QTime>
 
-// KDE
-//#include <kdebug.h>
-
-// Konsole
 #include "KeyboardTranslator.h"
 #include "Screen.h"
 #include "TerminalCharacterDecoder.h"

lib/qtermwidget/Filter.cpp

@@ -35,13 +35,8 @@
 #include <QDesktopServices>
 #include <QUrl>
 
-// KDE
-//#include <KLocale>
-//#include <KRun>
-
-// Konsole
 #include "TerminalCharacterDecoder.h"
-#include "konsole_wcwidth.h"
+#include "console_charwidth.h"
 
 using namespace Konsole;
 

lib/qtermwidget/History.cpp

@@ -37,13 +37,8 @@
 
 #include <QtDebug>
 
-// KDE
-//#include <kde_file.h>
-//#include <kdebug.h>
-
 // Reasonable line size
 #define LINE_SIZE    1024
-#define KDE_lseek lseek
 
 using namespace Konsole;
 
@@ -164,7 +159,7 @@ void HistoryFile::add(const unsigned char* bytes, int len)
 
   int rc = 0;
 
-  rc = KDE_lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryFile::add.seek"); return; }
+  rc = lseek(ion,length,SEEK_SET); if (rc < 0) { perror("HistoryFile::add.seek"); return; }
   rc = write(ion,bytes,len);       if (rc < 0) { perror("HistoryFile::add.write"); return; }
   length += rc;
 }
@@ -190,7 +185,7 @@ void HistoryFile::get(unsigned char* bytes, int len, int loc)
 
       if (loc < 0 || len < 0 || loc + len > length)
         fprintf(stderr,"getHist(...,%d,%d): invalid args.\n",len,loc);
-      rc = KDE_lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryFile::get.seek"); return; }
+      rc = lseek(ion,loc,SEEK_SET); if (rc < 0) { perror("HistoryFile::get.seek"); return; }
       rc = read(ion,bytes,len);     if (rc < 0) { perror("HistoryFile::get.read"); return; }
   }
 }
@@ -367,7 +362,6 @@ bool HistoryScrollBuffer::isWrappedLine(int lineNumber)
 
   if (lineNumber < _usedLines)
   {
-    //kDebug() << "Line" << lineNumber << "wrapped is" << _wrappedLine[bufferIndex(lineNumber)];
     return _wrappedLine[bufferIndex(lineNumber)];
   }
   else
@@ -388,10 +382,6 @@ void HistoryScrollBuffer::getCells(int lineNumber, int startColumn, int count, C
 
   const HistoryLine& line = _historyBuffer[bufferIndex(lineNumber)];
 
-  //kDebug() << "startCol " << startColumn;
-  //kDebug() << "line.size() " << line.size();
-  //kDebug() << "count " << count;
-
   Q_ASSERT( startColumn <= line.size() - count );
 
   memcpy(buffer, line.constData() + startColumn , count * sizeof(Character));
@@ -560,7 +550,6 @@ void* CompactHistoryBlock::allocate ( size_t length )
 
   void* block = tail;
   tail += length;
-  //kDebug() << "allocated " << length << " bytes at address " << block;
   allocCount++;
   return block;
 }
@@ -578,12 +567,10 @@ void* CompactHistoryBlockList::allocate(size_t size)
   {
     block = new CompactHistoryBlock();
     list.append ( block );
-    //kDebug() << "new block created, remaining " << block->remaining() << "number of blocks=" << list.size();
   }
   else
   {
     block = list.last();
-    //kDebug() << "old block used, remaining " << block->remaining();
   }
   return block->allocate(size);
 }
@@ -608,7 +595,6 @@ void CompactHistoryBlockList::deallocate(void* ptr)
   {
     list.removeAt(i);
     delete block;
-    //kDebug() << "block deleted, new size = " << list.size();
   }
 }
 
@@ -645,7 +631,6 @@ CompactHistoryLine::CompactHistoryLine ( const TextLine& line, CompactHistoryBlo
       k++;
     }
 
-    //kDebug() << "number of different formats in string: " << formatLength;
     formatArray = (CharacterFormat*) blockList.allocate(sizeof(CharacterFormat)*formatLength);
     Q_ASSERT (formatArray!=nullptr);
     text = (quint16*) blockList.allocate(sizeof(quint16)*line.size());
@@ -668,7 +653,6 @@ CompactHistoryLine::CompactHistoryLine ( const TextLine& line, CompactHistoryBlo
         c=line[k];
         formatArray[j].setFormat(c);
         formatArray[j].startPos=k;
-        //kDebug() << "format entry " << j << " at pos " << formatArray[j].startPos << " " << &(formatArray[j].startPos) ;
         j++;
       }
       k++;
@@ -678,15 +662,12 @@ CompactHistoryLine::CompactHistoryLine ( const TextLine& line, CompactHistoryBlo
     for ( int i=0; i<line.size(); i++ )
     {
       text[i]=line[i].character;
-      //kDebug() << "char " << i << " at mem " << &(text[i]);
     }
   }
-  //kDebug() << "line created, length " << length << " at " << &(length);
 }
 
 CompactHistoryLine::~CompactHistoryLine()
 {
-  //kDebug() << "~CHL";
   if (length>0) {
     blockList.deallocate(text);
     blockList.deallocate(formatArray);
@@ -723,7 +704,6 @@ CompactHistoryScroll::CompactHistoryScroll ( unsigned int maxLineCount )
     ,lines()
     ,blockList()
 {
-  //kDebug() << "scroll of length " << maxLineCount << " created";
   setMaxNbLines ( maxLineCount );
 }
 
@@ -755,7 +735,6 @@ void CompactHistoryScroll::addCells ( const Character a[], int count )
 void CompactHistoryScroll::addLine ( bool previousWrapped )
 {
   CompactHistoryLine *line = lines.last();
-  //kDebug() << "last line at address " << line;
   line->setWrapped(previousWrapped);
 }
 
@@ -768,7 +747,6 @@ int CompactHistoryScroll::getLineLen ( int lineNumber )
 {
   Q_ASSERT ( lineNumber >= 0 && lineNumber < lines.size() );
   CompactHistoryLine* line = lines[lineNumber];
-  //kDebug() << "request for line at address " << line;
   return line->getLength();
 }
 
@@ -790,7 +768,6 @@ void CompactHistoryScroll::setMaxNbLines ( unsigned int lineCount )
   while (lines.size() > (int) lineCount) {
     delete lines.takeAt(0);
   }
-  //kDebug() << "set max lines to: " << _maxLineCount;
 }
 
 bool CompactHistoryScroll::isWrappedLine ( int lineNumber )

lib/qtermwidget/History.h

@@ -27,14 +27,9 @@
 #include <QVector>
 #include <QTemporaryFile>
 
-// KDE
-//#include <ktemporaryfile.h>
-
-// Konsole
 #include "BlockArray.h"
 #include "Character.h"
 
-// map
 #if defined(Q_OS_WIN)
 #include <windows.h>
 #else

lib/qtermwidget/KeyboardTranslator.cpp

@@ -38,11 +38,6 @@
 
 #include "tools.h"
 
-// KDE
-//#include <KDebug>
-//#include <KLocale>
-//#include <KStandardDirs>
-
 using namespace Konsole;
 
 
@@ -69,7 +64,6 @@ KeyboardTranslatorManager::~KeyboardTranslatorManager()
 QString KeyboardTranslatorManager::findTranslatorPath(const QString& name)
 {
     return QString(get_kb_layout_dir() + name + QLatin1String(".keytab"));
-    //return KGlobal::dirs()->findResource("data","konsole/"+name+".keytab");
 }
 
 void KeyboardTranslatorManager::findTranslators()
@@ -79,9 +73,6 @@ void KeyboardTranslatorManager::findTranslators()
     filters << QLatin1String("*.keytab");
     dir.setNameFilters(filters);
     QStringList list = dir.entryList(filters);
-//    QStringList list = KGlobal::dirs()->findAllResources("data",
-//                                                         "konsole/*.keytab",
-//                                                        KStandardDirs::NoDuplicates);
 
     // add the name of each translator to the list and associated
     // the name with a null pointer to indicate that the translator
@@ -120,33 +111,8 @@ const KeyboardTranslator* KeyboardTranslatorManager::findTranslator(const QStrin
 
 bool KeyboardTranslatorManager::saveTranslator(const KeyboardTranslator* translator)
 {
-qDebug() << "KeyboardTranslatorManager::saveTranslator" << "unimplemented";
-Q_UNUSED(translator);
-#if 0
-    const QString path = KGlobal::dirs()->saveLocation("data","konsole/")+translator->name()
-           +".keytab";
-
-    //kDebug() << "Saving translator to" << path;
-
-    QFile destination(path);
-    if (!destination.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        qDebug() << "Unable to save keyboard translation:"
-                   << destination.errorString();
-        return false;
-    }
-
-    {
-        KeyboardTranslatorWriter writer(&destination);
-        writer.writeHeader(translator->description());
-
-        QListIterator<KeyboardTranslator::Entry> iter(translator->entries());
-        while ( iter.hasNext() )
-            writer.writeEntry(iter.next());
-    }
-
-    destination.close();
-#endif
+    qDebug() << "KeyboardTranslatorManager::saveTranslator" << "unimplemented";
+    Q_UNUSED(translator);
     return true;
 }