comparison kdiff3/src/kreplacements/kreplacements.cpp @ 66:efe33e938730

0.9.86

  *                                                                         *
  ***************************************************************************/
 
 
 #include "kreplacements.h"
+#include "common.h"
 
 #include <assert.h>
 
 #include <qnamespace.h>
 #include <qmessagebox.h>

 #include <qfontdialog.h>
 #include <qlabel.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #include <qlayout.h>
+#include <qdockarea.h>
 
 #include <vector>
 #include <iostream>
 #include <algorithm>
+
 
 static QString s_copyright;
 static QString s_email;
 static QString s_description;
 static QString s_appName;
 static QString s_version;
 static QString s_homepage;
+static KAboutData* s_pAboutData;
+
 
 #ifdef _WIN32
 #include <process.h>
 #include <windows.h>
 #endif

 }
 
 
 KToolBar::BarPosition KToolBar::barPos()
 {
+   if ( m_pMainWindow->leftDock()->hasDockWindow(this) ) return Left;
+   if ( m_pMainWindow->rightDock()->hasDockWindow(this) ) return Right;
+   if ( m_pMainWindow->topDock()->hasDockWindow(this) ) return Top;
+   if ( m_pMainWindow->bottomDock()->hasDockWindow(this) ) return Bottom;
    return Top;
 }
 
-void KToolBar::setBarPos(BarPosition)
-{
+void KToolBar::setBarPos(BarPosition bp)
+{
+   if ( bp == Left ) m_pMainWindow->moveDockWindow( this, DockLeft );
+   else if ( bp == Right ) m_pMainWindow->moveDockWindow( this, DockRight );
+   else if ( bp == Bottom ) m_pMainWindow->moveDockWindow( this, DockBottom );
+   else if ( bp == Top ) m_pMainWindow->moveDockWindow( this, DockTop );
 }
 
 KToolBar::KToolBar( QMainWindow* parent )
 : QToolBar( parent )
 {
+   m_pMainWindow = parent;
 }
 
 
 KMainWindow::KMainWindow( QWidget* parent, const QString& name )
 : QMainWindow( parent, name ), m_actionCollection(this)

    menuBar()->insertItem(i18n("&Directory"), directoryMenu);
    dirCurrentItemMenu = 0;
    dirCurrentSyncItemMenu = 0;
    movementMenu = new QPopupMenu();
    menuBar()->insertItem(i18n("&Movement"), movementMenu);
+   diffMenu = new QPopupMenu();
+   menuBar()->insertItem(i18n("D&iffview"), diffMenu);
    mergeMenu = new QPopupMenu();
    menuBar()->insertItem(i18n("&Merge"), mergeMenu);
    windowsMenu = new QPopupMenu();
    menuBar()->insertItem(i18n("&Window"), windowsMenu);
    settingsMenu = new QPopupMenu();

    }
 }
 
 void KMainWindow::slotAbout()
 {
+   QTabDialog d;
+   d.setCaption("About " + s_appName);
+   QTextBrowser* tb1 = new QTextBrowser(&d);
+   tb1->setWordWrap( QTextEdit::NoWrap );
+   tb1->setText(
+      s_appName + " Version " + s_version +
+      "\n\n" + s_description + 
+      "\n\n" + s_copyright +
+      "\n\nHomepage: " + s_homepage +
+      "\n\nLicence: GNU GPL Version 2"
+      );
+   d.addTab(tb1,i18n("&About"));
+      
+   std::list<KAboutData::AboutDataEntry>::iterator i;
+   
+   QString s2;   
+   for( i=s_pAboutData->m_authorList.begin(); i!=s_pAboutData->m_authorList.end(); ++i )
+   {
+      if ( !i->m_name.isEmpty() )    s2 +=         i->m_name    + "\n";
+      if ( !i->m_task.isEmpty() )    s2 += "   " + i->m_task    + "\n";
+      if ( !i->m_email.isEmpty() )   s2 += "   " + i->m_email   + "\n";
+      if ( !i->m_weblink.isEmpty() ) s2 += "   " + i->m_weblink + "\n";
+      s2 += "\n";
+   }
+   QTextBrowser* tb2 = new QTextBrowser(&d);
+   tb2->setWordWrap( QTextEdit::NoWrap );
+   tb2->setText(s2);
+   d.addTab(tb2,i18n("A&uthor"));
+   
+   QString s3;
+   for( i=s_pAboutData->m_creditList.begin(); i!=s_pAboutData->m_creditList.end(); ++i )
+   {
+      if ( !i->m_name.isEmpty() )    s3 +=         i->m_name    + "\n";
+      if ( !i->m_task.isEmpty() )    s3 += "   " + i->m_task    + "\n";
+      if ( !i->m_email.isEmpty() )   s3 += "   " + i->m_email   + "\n";
+      if ( !i->m_weblink.isEmpty() ) s3 += "   " + i->m_weblink + "\n";
+      s3 += "\n";
+   }
+   QTextBrowser* tb3 = new QTextBrowser(&d);
+   tb3->setWordWrap( QTextEdit::NoWrap );
+   tb3->setText(s3);
+   d.addTab(tb3,i18n("&Thanks To"));
+   
+   d.resize(400,300);
+   d.exec();
+/*
    QMessageBox::information(
       this,
       "About " + s_appName,
       s_appName + " Version " + s_version +
       "\n\n" + s_description + 
       "\n\n" + s_copyright +
       "\n\nHomepage: " + s_homepage +
       "\n\nLicence: GNU GPL Version 2"
       );
+*/
 }
 
 void KMainWindow::slotHelp()
 {
    showHelp();

    //return s.section(',', idx, idx).toInt();
 }
 
 void KConfig::writeEntry(const QString& k, const QFont& v )
 {
-   //m_map[k] = v.toString();
-   m_map[k] = v.family() + "," + QString::number(v.pointSize());
+   m_map[k] = v.family() + "," + QString::number(v.pointSize()) + "," + (v.bold() ? "bold" : "normal");
 }
 
 void KConfig::writeEntry(const QString& k, const QColor& v )
 {
    m_map[k] = numStr(v.red()) + "," + numStr(v.green()) + "," + numStr(v.blue());

    std::map<QString,QString>::iterator i = m_map.find( k );
    if ( i!=m_map.end() )
    {
       f.setFamily( subSection( i->second, 0, ',' ) );
       f.setPointSize( subSection( i->second, 1, ',' ).toInt() );
+      f.setBold( subSection( i->second, 2, ',' )=="bold" );
       //f.fromString(i->second);
    }
 
    return f;
 }

             p->dirCurrentSyncItemMenu = new QPopupMenu();
             p->directoryMenu->insertItem(i18n("Current Item Sync Operation"), p->dirCurrentSyncItemMenu);
          }
          addTo( p->dirCurrentSyncItemMenu );
       }
+      else if( name.left(4)=="diff")  addTo( p->diffMenu );
       else if( name[0]=='d')  addTo( p->directoryMenu );
       else if( name[0]=='f')  addTo( p->fileMenu );
       else if( name[0]=='w')  addTo( p->windowsMenu );
       else                    addTo( p->mergeMenu );
    }

             p->dirCurrentSyncItemMenu = new QPopupMenu();
             p->directoryMenu->insertItem(i18n("Current Item Sync Operation"), p->dirCurrentSyncItemMenu);
          }
          addTo( p->dirCurrentSyncItemMenu );
       }
+      else if( name.left(4)=="diff")  addTo( p->diffMenu );
       else if( name[0]=='d')  addTo( p->directoryMenu );
       else if( name[0]=='f')  addTo( p->fileMenu );
       else if( name[0]=='w')  addTo( p->windowsMenu );
       else              addTo( p->mergeMenu );
    }

 
 KAboutData::KAboutData( const QString& /*name*/, const QString& /*appName*/, const QString& /*version*/ )
 {
 }
 
-void KAboutData::addAuthor(const QString& /*name*/, int, const QString& /*email*/)
-{
+void KAboutData::addAuthor(const char* name, const char* task, const char* email, const char* weblink)
+{
+   m_authorList.push_back( AboutDataEntry( name, task, email, weblink) );
+}
+
+void KAboutData::addCredit(const char* name, const char* task, const char* email, const char* weblink)
+{
+   m_creditList.push_back( AboutDataEntry( name, task, email, weblink) );
 }
 
 /*  Option structure: e.g.:
   { "m", 0, 0 },
   { "merge", I18N_NOOP("Automatically merge the input."), 0 },

 KCmdLineArgs* KCmdLineArgs::parsedArgs()  // static
 {
    return &s_cmdLineArgs;
 }
 
-void KCmdLineArgs::init( int argc, char**argv, KAboutData* )  // static
+void KCmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData )  // static
 {
    s_argc = argc;
    s_argv = argv;
+   s_pAboutData = pAboutData;
 }
 
 void KCmdLineArgs::addCmdLineOptions( KCmdLineOptions* options ) // static
 {
    s_pOptions = options;

             s += "     Note that file1 will be treated as base of file2 and file3.\n";
             s += "\n";
             s += "If you start without arguments, then a dialog will appear\n";
             s += "where you can select your files via a filebrowser.\n";
             s += "\n";
-            s += "For more documentation, see the help-menu or the subdirectory doc.\n";
+
+            s += "Options:\n";
+
+            j=0;
+            int pos=s.length();
+            for( j=0; j<nofOptions; ++j )
+            {
+               if ( s_pOptions[j].longName!=0 )
+               {
+                  if (s_pOptions[j].shortName[0]!='+')
+                  {
+                     s += "-";
+                     if ( strlen(s_pOptions[j].shortName)>1 ) s += "-";
+                  }
+                  s += s_pOptions[j].shortName;
+                  s += QString().fill(' ', minMaxLimiter( 20 - ((int)s.length()-pos), 3, 20 ) );
+                  s += s_pOptions[j].longName;
+                  s +="\n";
+                  pos=s.length();
+               }
+               else
+               {
+                  s += "-";
+                  if ( strlen(s_pOptions[j].shortName)>1 ) s += "-";
+                  s += s_pOptions[j].shortName;
+                  s += ", ";
+               }
+            }
+            
+            s += "\nFor more documentation, see the help-menu or the subdirectory doc.\n";
 #ifdef _WIN32 
             // A windows program has no console
             KMessageBox::information(0, s,i18n("KDiff3-Usage"));
 #else
             std::cerr << s.latin1() << std::endl;