Changeset 2223

Timestamp:

08/15/08 13:47:52 (3 months ago)

Author:

hlamer

Message:

Autodetect of EOL mode

Location:

v2/branches/dev/monkey/src

Files:

• maininterface/ui/UISettings.cpp (modified) (3 diffs)
• maininterface/ui/UISettings.ui (modified) (16 diffs)
• pMonkeyStudio.cpp (modified) (1 diff)
• pMonkeyStudio.h (modified) (1 diff)
• qscintillamanager/pEditor.cpp (modified) (2 diffs)
• qscintillamanager/pEditor.h (modified) (1 diff)

v2/branches/dev/monkey/src/maininterface/ui/UISettings.cpp

@@ -318 +318 @@
         bgEolMode->button( eolMode() )->setChecked( true );
         cbEolVisibility->setChecked( eolVisibility() );
+        cbAutoDetectEol->setChecked( autoDetectEol() );
         gbWhitespaceVisibilityEnabled->setChecked( whitespaceVisibility() != QsciScintilla::WsInvisible );
         if ( bgWhitespaceVisibility->button( whitespaceVisibility() ) )
@@ -395 +396 @@
         setCreateBackupUponOpen( cbCreateBackupUponOpen->isChecked() ) ;
         setAutoEolConversion( cbAutoEolConversion->isChecked() );
+        setAutoDetectEol( cbAutoDetectEol->isChecked() );
         setDefaultEncoding( cbDefaultEncoding->currentText() );
         setSelectionBackgroundColor( QColor( tbSelectionBackground->toolTip() ) );
@@ -463 +465 @@
         setEolMode( (QsciScintilla::EolMode)bgEolMode->checkedId() );
         setEolVisibility( cbEolVisibility->isChecked() );
+        setAutoDetectEol( cbAutoDetectEol->isChecked() );
         setWhitespaceVisibility( QsciScintilla::WsInvisible );
         if ( gbWhitespaceVisibilityEnabled->isChecked() )

v2/branches/dev/monkey/src/maininterface/ui/UISettings.ui

@@ -213 +213 @@
     <widget class="QStackedWidget" name="swPages" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>10</number>
      </property>
      <widget class="QWidget" name="pGeneral" >
@@ -221 +221 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -507 +507 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -546 +546 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -772 +772 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -936 +936 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -1170 +1170 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -1431 +1431 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -1596 +1596 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -1744 +1744 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -1897 +1897 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -2193 +2193 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>
@@ -2206 +2206 @@
         <widget class="QGroupBox" name="gbEolMode" >
          <property name="title" >
-          <string>Eol Mode</string>
+          <string>EOL Mode</string>
          </property>
          <layout class="QGridLayout" >
@@ -2215 +2215 @@
            <number>3</number>
           </property>
-          <item row="1" column="0" colspan="3" >
+          <item row="2" column="0" colspan="3" >
            <widget class="QCheckBox" name="cbEolVisibility" >
             <property name="text" >
@@ -2240 +2240 @@
             <property name="text" >
              <string>Unix</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QCheckBox" name="cbAutoDetectEol" >
+            <property name="text" >
+             <string>Autodetect EOL</string>
             </property>
            </widget>
@@ -2468 +2475 @@
         <y>0</y>
         <width>481</width>
-        <height>699</height>
+        <height>705</height>
        </rect>
       </property>

v2/branches/dev/monkey/src/pMonkeyStudio.cpp

@@ -1554 +1554 @@
 { return MonkeyCore::settings()->value( settingsPath() +"/EolVisibility", false ).toBool(); }
 
+void pMonkeyStudio::setAutoDetectEol( bool detect )
+{ MonkeyCore::settings()->setValue( settingsPath() +"/AutoDetectEol", detect ); }
+
+const bool pMonkeyStudio::autoDetectEol()
+{ return MonkeyCore::settings()->value( settingsPath() +"/AutoDetectEol", false ).toBool(); }
+
 void pMonkeyStudio::setWhitespaceVisibility( QsciScintilla::WhitespaceVisibility w )
 { MonkeyCore::settings()->setValue( settingsPath() +"/WhitespaceVisibility", w ); }

v2/branches/dev/monkey/src/pMonkeyStudio.h

@@ -241 +241 @@
         Q_MONKEY_EXPORT void setEolVisibility( bool visible );
         Q_MONKEY_EXPORT const bool eolVisibility();
+        Q_MONKEY_EXPORT void setAutoDetectEol( bool detect );
+        Q_MONKEY_EXPORT const bool autoDetectEol();
         Q_MONKEY_EXPORT void setWhitespaceVisibility( QsciScintilla::WhitespaceVisibility visibility );
         Q_MONKEY_EXPORT const QsciScintilla::WhitespaceVisibility whitespaceVisibility();

v2/branches/dev/monkey/src/qscintillamanager/pEditor.cpp

@@ -158 +158 @@
 }
 
+void pEditor::autoDetectEol ()
+{
+        QString currText = text();
+        if (text().indexOf("\r\n") != -1)
+        {
+                setEolMode (QsciScintilla::EolWindows);
+                return;
+        }
+        if (text().indexOf("\n") != -1)
+        {
+                setEolMode (QsciScintilla::EolUnix);
+                return;
+        }
+}
+
 int pEditor::lineNumbersMarginWidth() const
 {
@@ -293 +308 @@
         {
                 autoDetectIndent ();
+        }
+        
+        //autodetect eol, if need
+        if (pMonkeyStudio::autoDetectEol())
+        {
+                autoDetectEol ();
         }
         

v2/branches/dev/monkey/src/qscintillamanager/pEditor.h

@@ -69 +69 @@
         void autoDetectIndent();
 
+        // Set for self EOL mode according with actual in the file
+        void autoDetectEol();
+
 protected:
         void keyPressEvent( QKeyEvent* );