[dyntrans-cvs] qt-tr/src/widgets qcombobox.cpp,1.1.1.1,1.2 qlabel.cpp,1.3,1.4 qlineedit.cpp,1.1.1.1,
Status: Pre-Alpha
Brought to you by:
klichota
Menu
▾
▴
[dyntrans-cvs] qt-tr/src/widgets qcombobox.cpp,1.1.1.1,1.2 qlabel.cpp,1.3,1.4 qlineedit.cpp,1.1.1.1,1.2 qmenudata.cpp,1.1.1.1,1.2 qmenudata.h,1.1.1.1,1.2 qpopupmenu.cpp,1.1.1.1,1.2 qtextedit.cpp,1.1.1.1,1.2
|
From: Krzysztof L. <kli...@us...> - 2004-09-27 23:47:33
|
Update of /cvsroot/dyntrans/qt-tr/src/widgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11913/src/widgets Modified Files: qcombobox.cpp qlabel.cpp qlineedit.cpp qmenudata.cpp qmenudata.h qpopupmenu.cpp qtextedit.cpp Log Message: * Implemented editing translation for QPopupMenu. * Added find/findRev/contains methods to QTrString. * Added declaration of arg() methods to QTrString. * Added QTrString::operator!() and QTrString::null. Index: qmenudata.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qmenudata.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qmenudata.cpp 25 Sep 2004 11:28:22 -0000 1.1.1.1 +++ qmenudata.cpp 27 Sep 2004 23:47:18 -0000 1.2 @@ -243,7 +243,7 @@ functions. */ -int QMenuData::insertAny( const QString *text, const QPixmap *pixmap, +int QMenuData::insertAny( const QTrString *text, const QPixmap *pixmap, QPopupMenu *popup, const QIconSet* iconset, int id, int index, QWidget* widget, QCustomMenuItem* custom ) { @@ -272,11 +272,11 @@ mi->is_separator = TRUE; // separator } else { #ifndef Q_OS_TEMP - mi->text_data = text?*text:QString(); + mi->text_data = text?*text:QTrString(); #else - QString newText( *text ); + QTrString newText( *text ); newText.truncate( newText.findRev( '\t' ) ); - mi->text_data = newText.isEmpty()?QString():newText; + mi->text_data = newText.isEmpty()?QTrString():newText; #endif #ifndef QT_NO_ACCEL mi->accel_key = Qt::Key_unknown; @@ -407,7 +407,7 @@ qnamespace.h */ -int QMenuData::insertItem( const QString &text, +int QMenuData::insertItem( const QTrString &text, const QObject *receiver, const char* member, const QKeySequence& accel, int id, int index ) { @@ -435,7 +435,7 @@ */ int QMenuData::insertItem( const QIconSet& icon, - const QString &text, + const QTrString &text, const QObject *receiver, const char* member, const QKeySequence& accel, int id, int index ) { @@ -523,7 +523,7 @@ \sa removeItem(), changeItem(), setAccel(), connectItem() */ -int QMenuData::insertItem( const QString &text, int id, int index ) +int QMenuData::insertItem( const QTrString &text, int id, int index ) { return insertAny( &text, 0, 0, 0, id, index ); } @@ -541,7 +541,7 @@ */ int QMenuData::insertItem( const QIconSet& icon, - const QString &text, int id, int index ) + const QTrString &text, int id, int index ) { return insertAny( &text, 0, 0, &icon, id, index ); } @@ -561,7 +561,7 @@ \sa removeItem(), changeItem(), setAccel(), connectItem() */ -int QMenuData::insertItem( const QString &text, QPopupMenu *popup, +int QMenuData::insertItem( const QTrString &text, QPopupMenu *popup, int id, int index ) { return insertAny( &text, 0, popup, 0, id, index ); @@ -584,7 +584,7 @@ */ int QMenuData::insertItem( const QIconSet& icon, - const QString &text, QPopupMenu *popup, + const QTrString &text, QPopupMenu *popup, int id, int index ) { return insertAny( &text, 0, popup, &icon, id, index ); @@ -937,10 +937,10 @@ \sa changeItem(), pixmap(), iconSet() */ -QString QMenuData::text( int id ) const +QTrString QMenuData::text( int id ) const { QMenuItem *mi = findItem( id ); - return mi ? mi->text() : QString::null; + return mi ? mi->text() : QTrString::null; } /*! @@ -957,7 +957,7 @@ } /*! - \fn void QMenuData::changeItem( const QString &, int ) + \fn void QMenuData::changeItem( const QTrString &, int ) \obsolete Changes the text of the menu item \a id. If the item has an icon, @@ -976,7 +976,7 @@ */ /*! - \fn void QMenuData::changeItem( const QIconSet &, const QString &, int ) + \fn void QMenuData::changeItem( const QIconSet &, const QTrString &, int ) \obsolete Changes the icon and text of the menu item \a id. @@ -991,7 +991,7 @@ \sa text() */ -void QMenuData::changeItem( int id, const QString &text ) +void QMenuData::changeItem( int id, const QTrString &text ) { QMenuData *parent; QMenuItem *mi = findItem( id, &parent ); @@ -1004,7 +1004,7 @@ } mi->text_data = text; #ifndef QT_NO_ACCEL - if ( !mi->accel_key && text.find( '\t' ) != -1 ) + if ( !mi->accel_key && ((QString)text).find( '\t' ) != -1 ) mi->accel_key = Qt::Key_unknown; #endif parent->menuContentsChanged(); @@ -1031,7 +1031,7 @@ i->height() == pixmap.height() && !mi->text(); if ( !mi->text_data.isNull() ) // delete text - mi->text_data = QString::null; + mi->text_data = QTrString::null; if ( !pixmap.isNull() ) mi->pixmap_data = new QPixmap( pixmap ); else @@ -1053,7 +1053,7 @@ \sa pixmap() */ -void QMenuData::changeItem( int id, const QIconSet &icon, const QString &text ) +void QMenuData::changeItem( int id, const QIconSet &icon, const QTrString &text ) { changeItem( id, text ); changeItemIconSet( id, icon ); @@ -1419,7 +1419,7 @@ \sa whatsThis() */ -void QMenuData::setWhatsThis( int id, const QString& text ) +void QMenuData::setWhatsThis( int id, const QTrString& text ) { QMenuData *parent; @@ -1432,15 +1432,15 @@ /*! Returns the What's This help text for the item with identifier \a - id or QString::null if no text has yet been defined. + id or QTrString::null if no text has yet been defined. \sa setWhatsThis() */ -QString QMenuData::whatsThis( int id ) const +QTrString QMenuData::whatsThis( int id ) const { QMenuItem *mi = findItem( id ); - return mi? mi->whatsThis() : QString::null; + return mi? mi->whatsThis() : QTrString::null; } Index: qcombobox.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qcombobox.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qcombobox.cpp 25 Sep 2004 11:29:21 -0000 1.1.1.1 +++ qcombobox.cpp 27 Sep 2004 23:47:18 -0000 1.2 @@ -630,7 +630,7 @@ if ( d->usingListBox() ) d->listBox()->insertItem( QString::fromLatin1(tmp), index ); else - d->popup()->insertItem( QString::fromLatin1(tmp), index, index ); + d->popup()->insertItem( (QTrString)QString::fromLatin1(tmp), index, index ); if ( index++ == d->current && d->current < count() ) { if ( d->ed ) { d->ed->setText( text( d->current ) ); @@ -658,7 +658,7 @@ if ( d->usingListBox() ) d->listBox()->insertItem( *it, index ); else - d->popup()->insertItem( *it, index, index ); + d->popup()->insertItem( (QTrString)*it, index, index ); if ( index++ == d->current && d->current < count() ) { if ( d->ed ) { d->ed->setText( text( d->current ) ); @@ -705,7 +705,7 @@ if ( d->usingListBox() ) d->listBox()->insertItem( QString::fromLatin1(strings[i]), index ); else - d->popup()->insertItem( QString::fromLatin1(strings[i]), index, index ); + d->popup()->insertItem( (QTrString)QString::fromLatin1(strings[i]), index, index ); i++; if ( index++ == d->current && d->current < count() ) { if ( d->ed ) { @@ -734,7 +734,7 @@ if ( d->usingListBox() ) d->listBox()->insertItem( t, index ); else - d->popup()->insertItem( t, index, index ); + d->popup()->insertItem( (QTrString)t, index, index ); if ( index != cnt ) reIndex(); if ( index == d->current && d->current < count() ) { @@ -792,7 +792,7 @@ if ( d->usingListBox() ) d->listBox()->insertItem( pixmap, text, index ); else - d->popup()->insertItem( pixmap, text, index, index ); + d->popup()->insertItem( pixmap, (QTrString)text, index, index ); if ( index != cnt ) reIndex(); if ( index == d->current && d->current < count() ) { @@ -950,7 +950,7 @@ if ( d->usingListBox() ) d->listBox()->changeItem( t, index ); else - d->popup()->changeItem( t, index ); + d->popup()->changeItem( (QTrString)t, index ); if ( index == d->current ) { if ( d->ed ) { d->ed->setText( text( d->current ) ); @@ -1531,12 +1531,12 @@ for(unsigned int i = 0; i < d->listBox()->count(); i++) { QListBoxItem *item = d->listBox()->item(i); if(item->rtti() == QListBoxText::RTTI) { - d->popup()->insertItem(item->text(), i, i); + d->popup()->insertItem((QTrString)item->text(), i, i); } else if(item->rtti() == QListBoxPixmap::RTTI) { if(item->pixmap()) - d->popup()->insertItem(QIconSet(*item->pixmap()), item->text(), i, i); + d->popup()->insertItem(QIconSet(*item->pixmap()), (QTrString)item->text(), i, i); else - d->popup()->insertItem(item->text(), i, i); + d->popup()->insertItem((QTrString)item->text(), i, i); } else { d->popup()->insertItem(new QComboBoxPopupItem(item), i, i); } Index: qpopupmenu.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qpopupmenu.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qpopupmenu.cpp 25 Sep 2004 11:29:26 -0000 1.1.1.1 +++ qpopupmenu.cpp 27 Sep 2004 23:47:18 -0000 1.2 @@ -1592,6 +1592,19 @@ e->pos().y() >= contentsRect().height() - sh))) //down return; + if ( e->button() == RightButton ) { + int item = itemAtPos( e->pos() ); + if ( item == -1 ) { + return; + } + register QMenuItem *mi = mitems->at(item); + //FIXME: what about whatsthis text? + if (QApplication::getTrHandler()->editTranslation(mi->trTextRef()) == TRUE) + { + this->updateItem(item); + } + } + mouseBtDn = TRUE; // mouse button down int item = itemAtPos( e->pos() ); if ( item == -1 ) { @@ -1601,6 +1614,8 @@ return; } register QMenuItem *mi = mitems->at(item); + + if ( item != actItem ) // new item activated setActiveItem( item ); Index: qmenudata.h =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qmenudata.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qmenudata.h 25 Sep 2004 11:29:46 -0000 1.1.1.1 +++ qmenudata.h 27 Sep 2004 23:47:18 -0000 1.2 @@ -43,6 +43,7 @@ #include "qiconset.h" // conversion QPixmap->QIconset #include "qkeysequence.h" #include "qstring.h" +#include "qtrstring.h" #include "qsignal.h" #include "qfont.h" #endif // QT_H @@ -65,8 +66,10 @@ int id() const { return ident; } QIconSet *iconSet() const { return iconset_data; } - QString text() const { return text_data; } - QString whatsThis() const { return whatsthis_data; } + QTrString text() const { return text_data; } + QTrString & trTextRef() { return text_data; } + QTrString whatsThis() const { return whatsthis_data; } + QTrString & trWhatsThisRef() { return whatsthis_data; } QPixmap *pixmap() const { return pixmap_data; } QPopupMenu *popup() const { return popup_menu; } QWidget *widget() const { return widget_item; } @@ -82,16 +85,16 @@ bool isVisible() const { return is_visible; } bool isEnabledAndVisible() const { return is_enabled && is_visible; } - void setText( const QString &text ) { text_data = text; } + void setText( const QTrString &text ) { text_data = text; } void setDirty( bool dirty ) { is_dirty = dirty; } void setVisible( bool visible ) { is_visible = visible; } - void setWhatsThis( const QString &text ) { whatsthis_data = text; } + void setWhatsThis( const QTrString &text ) { whatsthis_data = text; } private: int ident; // item identifier QIconSet *iconset_data; // icons - QString text_data; // item text - QString whatsthis_data; // item Whats This help text + QTrString text_data; // item text + QTrString whatsthis_data; // item Whats This help text QPixmap *pixmap_data; // item pixmap QPopupMenu *popup_menu; // item popup menu QWidget *widget_item; // widget menu item @@ -145,13 +148,26 @@ uint count() const; + int insertItem( const QTrString &text, + const QObject *receiver, const char* member, + const QKeySequence& accel = 0, int id = -1, int index = -1 ); int insertItem( const QString &text, const QObject *receiver, const char* member, + const QKeySequence& accel = 0, int id = -1, int index = -1 ) + { + return this->insertItem((QTrString)text, receiver, member, accel, id, index); + } + int insertItem( const QIconSet& icon, + const QTrString &text, + const QObject *receiver, const char* member, const QKeySequence& accel = 0, int id = -1, int index = -1 ); int insertItem( const QIconSet& icon, const QString &text, const QObject *receiver, const char* member, - const QKeySequence& accel = 0, int id = -1, int index = -1 ); + const QKeySequence& accel = 0, int id = -1, int index = -1 ) + { + return this->insertItem(icon, (QTrString)text, receiver, member, accel, id, index); + } int insertItem( const QPixmap &pixmap, const QObject *receiver, const char* member, const QKeySequence& accel = 0, int id = -1, int index = -1 ); @@ -160,15 +176,35 @@ const QObject *receiver, const char* member, const QKeySequence& accel = 0, int id = -1, int index = -1 ); - int insertItem( const QString &text, int id=-1, int index=-1 ); + int insertItem( const QTrString &text, int id=-1, int index=-1 ); + int insertItem( const QString &text, int id=-1, int index=-1 ) + { + return this->insertItem((QTrString)text, id, index); + } int insertItem( const QIconSet& icon, - const QString &text, int id=-1, int index=-1 ); + const QTrString &text, int id=-1, int index=-1 ); + int insertItem( const QIconSet& icon, + const QString &text, int id=-1, int index=-1 ) + { + return this->insertItem(icon, (QTrString)text, id, index); + } + int insertItem( const QTrString &text, QPopupMenu *popup, + int id=-1, int index=-1 ); int insertItem( const QString &text, QPopupMenu *popup, + int id=-1, int index=-1 ) + { + return this->insertItem((QTrString)text, popup, id, index); + } + int insertItem( const QIconSet& icon, + const QTrString &text, QPopupMenu *popup, int id=-1, int index=-1 ); int insertItem( const QIconSet& icon, const QString &text, QPopupMenu *popup, - int id=-1, int index=-1 ); + int id=-1, int index=-1 ) + { + return this->insertItem(icon, (QTrString)text, popup, id, index); + } int insertItem( const QPixmap &pixmap, int id=-1, int index=-1 ); @@ -198,23 +234,35 @@ #endif QIconSet *iconSet( int id ) const; - QString text( int id ) const; + QTrString text( int id ) const; QPixmap *pixmap( int id ) const; - void setWhatsThis( int id, const QString& ); - QString whatsThis( int id ) const; + void setWhatsThis( int id, const QTrString& ); + QTrString whatsThis( int id ) const; - void changeItem( int id, const QString &text ); + void changeItem( int id, const QTrString &text ); + void changeItem( int id, const QString &text ) + { + this->changeItem(id, (QTrString)text); + } void changeItem( int id, const QPixmap &pixmap ); - void changeItem( int id, const QIconSet &icon, const QString &text ); + void changeItem( int id, const QIconSet &icon, const QTrString &text ); + void changeItem( int id, const QIconSet &icon, const QString &text ) + { + this->changeItem(id, icon, (QTrString)text); + } void changeItem( int id, const QIconSet &icon, const QPixmap &pixmap ); - void changeItem( const QString &text, int id ) { changeItem( id, text); } // obsolete + void changeItem( const QTrString &text, int id ) { changeItem( id, text); } // obsolete + void changeItem( const QString &text, int id ) { changeItem( id, (QTrString)text); } // obsolete void changeItem( const QPixmap &pixmap, int id ) { changeItem( id, pixmap ); } // obsolete - void changeItem( const QIconSet &icon, const QString &text, int id ) { // obsolete + void changeItem( const QIconSet &icon, const QTrString &text, int id ) { // obsolete changeItem( id, icon, text ); } + void changeItem( const QIconSet &icon, const QString &text, int id ) { // obsolete + changeItem( id, icon, (QTrString)text ); + } bool isItemActive( int id ) const; @@ -263,7 +311,7 @@ virtual void menuDelPopup( QPopupMenu * ); private: - int insertAny( const QString *, const QPixmap *, QPopupMenu *, + int insertAny( const QTrString *, const QPixmap *, QPopupMenu *, const QIconSet*, int, int, QWidget* = 0, QCustomMenuItem* = 0); void removePopup( QPopupMenu * ); void changeItemIconSet( int id, const QIconSet &icon ); Index: qlabel.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qlabel.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- qlabel.cpp 26 Sep 2004 22:59:23 -0000 1.3 +++ qlabel.cpp 27 Sep 2004 23:47:18 -0000 1.4 @@ -176,7 +176,7 @@ void QLabel::mousePressEvent( QMouseEvent *e ) { - if ( e->button() == LeftButton ) { + if ( e->button() != RightButton ) { e->ignore(); return; } @@ -198,7 +198,7 @@ trElement->updateTranslation(newTranslation); */ - if (QApplication::getTrHandler()->editTranslation(this->ltext) == true) + if (QApplication::getTrHandler()->editTranslation(this->ltext) == TRUE) { QSize osh = sizeHint(); @@ -775,7 +775,7 @@ if (this->ltext.translationValid() == FALSE) { //draw highlight background - p->fillRect(cr, Qt::cyan); + p->fillRect(cr, Qt::yellow); } } Index: qlineedit.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qlineedit.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qlineedit.cpp 25 Sep 2004 11:28:42 -0000 1.1.1.1 +++ qlineedit.cpp 27 Sep 2004 23:47:18 -0000 1.2 @@ -50,6 +50,7 @@ #include "qstringlist.h" #include "qguardedptr.h" #include "qstyle.h" +#include "qtrstring.h" #include "qwhatsthis.h" #include "../kernel/qinternal_p.h" #include "private/qtextlayout_p.h" Index: qtextedit.cpp =================================================================== RCS file: /cvsroot/dyntrans/qt-tr/src/widgets/qtextedit.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- qtextedit.cpp 25 Sep 2004 11:30:05 -0000 1.1.1.1 +++ qtextedit.cpp 27 Sep 2004 23:47:18 -0000 1.2 @@ -434,7 +434,7 @@ by using the HTML font tag \c {<font color=colorname>}. The color name can be one of the color names from the X11 color database, or a RGB hex value (e.g \c {#00ff00}). Example of valid color tags: - \c {<font color=red>}, \c {<font color="light blue">}, \c {<font + \c {<font color=red>}, \c{<font color="light blue">},\c {<font color="#223344">}. Bold, italic and underline settings can be specified by the tags \c {<b>}, \c <i> and \c {<u>}. Note that a tag does not necessarily have to be closed. A valid example: @@ -5077,7 +5077,7 @@ if ( n ) { int i = n ==1 && !always_ask ? popup.idAt( 0 ) : popup.exec( pt ); if ( i >= 0 ) - return popup.text(i).latin1(); + return ((QString)popup.text(i)).latin1(); } #else QString fmt; |
