[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/okteta/program/oktetakakao/controllers/view/gotooffset
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2009-03-04 0:36:45
Message-ID: 1236127005.678354.12403.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 934879 by kossebau:

changed: start with current offset

 M  +5 -1      gotooffsetcontroller.cpp  
 M  +10 -2     kgotooffsetdialog.cpp  
 M  +1 -0      kgotooffsetdialog.h  


--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/gotooffset/gotooffsetcontroller.cpp \
#934878:934879 @@ -76,16 +76,20 @@
 
 void GotoOffsetController::gotoOffset()
 {
+    const int startOffset = mByteArrayDisplay->startOffset();
+
     // ensure dialog
     if( !mGotoOffsetDialog )
     {
         mGotoOffsetDialog = new KGotoOffsetDialog( 0 );
-        const int startOffset = mByteArrayDisplay->startOffset();
         mGotoOffsetDialog->setRange( startOffset, startOffset+mByteArray->size()-1 \
);  mGotoOffsetDialog->setHasView( true );
         connect( mGotoOffsetDialog, SIGNAL(okClicked()), SLOT(onOkClicked()) );
     }
 
+    const int currentOffset = mByteArrayDisplay->cursorPosition();
+    mGotoOffsetDialog->setOffset( startOffset + currentOffset );
+
     mGotoOffsetDialog->show();
 }
 
--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/gotooffset/kgotooffsetdialog.cpp \
#934878:934879 @@ -130,6 +130,13 @@
     enableButtonOk( false );
 }
 
+void KGotoOffsetDialog::setOffset( int offset )
+{
+    const int isHexadecimal = ( mSelector->currentIndex() == 0 );
+    const int base = isHexadecimal ? 16 : 10;
+    mOffsetEdit->lineEdit()->setText( QString::number(offset,base) );
+}
+
 void KGotoOffsetDialog::setRange( int firstOffset, int lastOffset )
 {
 Q_UNUSED( firstOffset )
@@ -149,7 +156,8 @@
 int KGotoOffsetDialog::offset() const
 {
     const int isHexadecimal = ( mSelector->currentIndex() == 0 );
-    const int offset = mOffsetEdit->currentText().toInt( 0, isHexadecimal?16:10 );
+    const int base = isHexadecimal ? 16 : 10;
+    const int offset = mOffsetEdit->currentText().toInt( 0, base );
     return offset;
 }
 
@@ -172,7 +180,7 @@
 
 void KGotoOffsetDialog::showEvent( QShowEvent* showEvent )
 {
-    KDialog::showEvent(showEvent);
+    KDialog::showEvent( showEvent );
     mOffsetEdit->setFocus();
 }
 
--- trunk/KDE/kdeutils/okteta/program/oktetakakao/controllers/view/gotooffset/kgotooffsetdialog.h \
#934878:934879 @@ -43,6 +43,7 @@
     ~KGotoOffsetDialog();
 
   public: // set
+    void setOffset( int offset );
     void setRange( int firstOffset, int lastOffset );
     void setHasView( bool hasView );
 


[prev in list] [next in list] [prev in thread] [next in thread]