Changeset 14445


Ignore:
Timestamp:
Jan 11, 2015, 3:01:13 PM (6 years ago)
Author:
mikedld
Message:

Improve filter bar look (Qt client)

Use normal but semi-transparent color instead of 'disabled' color for
counts drawing.
Do not leave empty space for icon when selected item doesn't have one.
Use null pixmaps/icons instead of non-null blank ones.
Implement our own sizeHint and minimumSizeHint to make sure both combos
have the same height.
Make activity combo width fixed, tracker combo width to fit its content
and line edit to occupy the rest.
Add 'Search...' placeholder to line edit.

Location:
trunk/qt
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/qt/favicon.cc

    r14394 r14445  
    105105  ensureCacheDirHasBeenScanned ();
    106106
    107   const QPixmap pixmap = myPixmaps[ host ];
    108   return pixmap.size()==rightSize ? pixmap : pixmap.scaled(rightSize);
     107  const QPixmap pixmap = myPixmaps[host];
     108  return pixmap.isNull () || pixmap.size () == rightSize ? pixmap : pixmap.scaled (rightSize);
    109109}
    110110
     
    119119    {
    120120      // add a placholder s.t. we only ping the server once per session
    121       QPixmap tmp (rightSize);
    122       tmp.fill (Qt::transparent);
    123       myPixmaps.insert (host, tmp);
     121      myPixmaps.insert (host, QPixmap ());
    124122
    125123      // try to download the favicon
  • trunk/qt/filterbar.cc

    r14430 r14445  
    4242namespace
    4343{
    44   int getHSpacing (QWidget * w)
     44  int getHSpacing (const QWidget * w)
    4545  {
    4646    return qMax (int (HIG::PAD_SMALL), w->style ()->pixelMetric (QStyle::PM_LayoutHorizontalSpacing, 0, w));
     47  }
     48
     49  QColor
     50  getFadedColor (const QColor& color)
     51  {
     52    QColor fadedColor (color);
     53    fadedColor.setAlpha (128);
     54    return fadedColor;
     55  }
     56
     57  void
     58  narrowRect (QRect& rect, int dx1, int dx2, Qt::LayoutDirection direction)
     59  {
     60    if (direction == Qt::LeftToRight)
     61      rect.adjust (dx1, 0, -dx2, 0);
     62    else
     63      rect.adjust (dx2, 0, -dx1, 0);
    4764  }
    4865}
     
    87104    {
    88105      QStyleOptionViewItem disabledOption = option;
    89       disabledOption.state &= ~ (QStyle::State_Enabled | QStyle::State_Selected);
     106      const QPalette::ColorRole disabledColorRole = (disabledOption.state & QStyle::State_Selected) ?
     107                                                     QPalette::HighlightedText : QPalette::Text;
     108      disabledOption.palette.setColor (disabledColorRole, getFadedColor (disabledOption.palette.color (disabledColorRole)));
     109
    90110      QRect boundingBox = option.rect;
    91111
    92112      const int hmargin = getHSpacing (myCombo);
    93       boundingBox.setLeft (boundingBox.left () + hmargin);
    94       boundingBox.setRight (boundingBox.right () - hmargin);
     113      boundingBox.adjust (hmargin, 0, -hmargin, 0);
    95114
    96115      QRect decorationRect = rect (option, index, Qt::DecorationRole);
    97       decorationRect.moveLeft (decorationRect.left ());
    98116      decorationRect.setSize (myCombo->iconSize ());
    99       decorationRect = QStyle::alignedRect (Qt::LeftToRight,
     117      decorationRect = QStyle::alignedRect (option.direction,
    100118                                            Qt::AlignLeft|Qt::AlignVCenter,
    101119                                            decorationRect.size (), boundingBox);
    102       boundingBox.setLeft (decorationRect.right () + hmargin);
     120      narrowRect (boundingBox, decorationRect.width () + hmargin, 0, option.direction);
    103121
    104122      QRect countRect  = rect (option, index, TorrentCountStringRole);
    105       countRect = QStyle::alignedRect (Qt::LeftToRight,
     123      countRect = QStyle::alignedRect (option.direction,
    106124                                       Qt::AlignRight|Qt::AlignVCenter,
    107125                                       countRect.size (), boundingBox);
    108       boundingBox.setRight (countRect.left () - hmargin);
     126      narrowRect (boundingBox, 0, countRect.width () + hmargin, option.direction);
    109127      const QRect displayRect = boundingBox;
    110128
     
    149167  QComboBox (parent)
    150168{
     169  setSizeAdjustPolicy (QComboBox::AdjustToContents);
    151170}
    152171
     
    161180
    162181  return count;
     182}
     183
     184QSize
     185FilterBarComboBox::minimumSizeHint () const
     186{
     187  QFontMetrics fm (fontMetrics ());
     188  const QSize textSize = fm.boundingRect (itemText (0)).size ();
     189  const QSize countSize = fm.boundingRect (itemData (0, TorrentCountStringRole).toString ()).size ();
     190  return calculateSize (textSize, countSize);
     191}
     192
     193QSize
     194FilterBarComboBox::sizeHint () const
     195{
     196  QFontMetrics fm (fontMetrics ());
     197  QSize maxTextSize (0, 0);
     198  QSize maxCountSize (0, 0);
     199  for (int i = 0, n = count (); i < n; ++i)
     200  {
     201    const QSize textSize = fm.boundingRect (itemText (i)).size ();
     202    maxTextSize.setHeight (qMax (maxTextSize.height (), textSize.height ()));
     203    maxTextSize.setWidth (qMax (maxTextSize.width (), textSize.width ()));
     204
     205    const QSize countSize = fm.boundingRect (itemData (i, TorrentCountStringRole).toString ()).size ();
     206    maxCountSize.setHeight (qMax (maxCountSize.height (), countSize.height ()));
     207    maxCountSize.setWidth (qMax (maxCountSize.width (), countSize.width ()));
     208  }
     209
     210  return calculateSize (maxTextSize, maxCountSize);
     211}
     212
     213QSize
     214FilterBarComboBox::calculateSize (const QSize& textSize, const QSize& countSize) const
     215{
     216  const int hmargin = getHSpacing (this);
     217
     218  QStyleOptionComboBox option;
     219  initStyleOption (&option);
     220
     221  QSize contentSize = iconSize () + QSize (4, 2);
     222  contentSize.setHeight (qMax (contentSize.height (), textSize.height ()));
     223  contentSize.rwidth () += hmargin + textSize.width ();
     224  contentSize.rwidth () += hmargin + countSize.width ();
     225
     226  return style ()->sizeFromContents (QStyle::CT_ComboBox, &option, contentSize, this).expandedTo (qApp->globalStrut ());
    163227}
    164228
     
    181245    {
    182246      QStyle * s = style ();
     247      const int hmargin = getHSpacing (this);
     248
    183249      QRect rect = s->subControlRect (QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxEditField, this);
    184       const int hmargin = getHSpacing (this);
    185       rect.setRight (rect.right () - hmargin);
     250      rect.adjust (2, 1, -2, -1);
    186251
    187252      // draw the icon
     
    196261      if (!pixmap.isNull ())
    197262        {
    198           s->drawItemPixmap (&painter, rect, Qt::AlignLeft|Qt::AlignVCenter, pixmap);
    199           rect.setLeft (rect.left () + pixmap.width () + hmargin);
     263          const QRect iconRect = QStyle::alignedRect(opt.direction, Qt::AlignLeft | Qt::AlignVCenter,
     264                                                     opt.iconSize, rect);
     265          painter.drawPixmap (iconRect.topLeft (), pixmap);
     266          narrowRect (rect, iconRect.width () + hmargin, 0, opt.direction);
    200267        }
    201268
     
    205272        {
    206273          const QPen pen = painter.pen ();
    207           painter.setPen (opt.palette.color (QPalette::Disabled, QPalette::Text));
    208           QRect r = s->itemTextRect (painter.fontMetrics (), rect, Qt::AlignRight|Qt::AlignVCenter, false, text);
    209           painter.drawText (r, 0, text);
    210           rect.setRight (r.left () - hmargin);
     274          painter.setPen (getFadedColor (pen.color ()));
     275          const QRect textRect = QStyle::alignedRect(opt.direction, Qt::AlignRight | Qt::AlignVCenter,
     276                                                     QSize (opt.fontMetrics.width (text), rect.height ()), rect);
     277          painter.drawText (textRect, Qt::AlignRight | Qt::AlignVCenter, text);
     278          narrowRect (rect, 0, textRect.width () + hmargin, opt.direction);
    211279          painter.setPen (pen);
    212280        }
     
    215283      text = modelIndex.data (Qt::DisplayRole).toString ();
    216284      text = painter.fontMetrics ().elidedText (text, Qt::ElideRight, rect.width ());
    217       s->drawItemText (&painter, rect, Qt::AlignLeft|Qt::AlignVCenter, opt.palette, true, text);
     285      painter.drawText (rect, Qt::AlignLeft | Qt::AlignVCenter, text);
    218286    }
    219287}
     
    238306  myClearButton->setIconSize (QSize (iconSize, iconSize));
    239307  myClearButton->setIcon (icon);
     308  myClearButton->setFixedSize (myClearButton->iconSize () + QSize (2, 2));
    240309  myClearButton->hide ();
    241310
    242311  const int frameWidth = style ()->pixelMetric (QStyle::PM_DefaultFrameWidth);
    243312  const QSize minSizeHint = minimumSizeHint ();
    244   const QSize buttonSizeHint = myClearButton->sizeHint ();
    245 
    246   setStyleSheet (QString::fromLatin1 ("QLineEdit{padding-right:%1px}").arg (buttonSizeHint.width () + frameWidth + 1));
    247   setMinimumSize (qMax (minSizeHint.width (), buttonSizeHint.width () + frameWidth * 2 + 2),
    248                   qMax (minSizeHint.height (), buttonSizeHint.height () + frameWidth * 2 + 2));
     313  const QSize buttonSize = myClearButton->size ();
     314
     315  setStyleSheet (QString::fromLatin1 ("QLineEdit{padding-right:%1px}").arg (buttonSize.width () + frameWidth + 1));
     316  setMinimumSize (qMax (minSizeHint.width (), buttonSize.width () + frameWidth * 2 + 2),
     317                  qMax (minSizeHint.height (), buttonSize.height () + frameWidth * 2 + 2));
    249318
    250319  connect (this, SIGNAL (textChanged (QString)), this, SLOT (updateClearButtonVisibility ()));
     
    253322  setClearButtonEnabled (true);
    254323#endif
    255 }
    256 
    257 void FilterBarLineEdit::resizeEvent (QResizeEvent * event)
     324
     325#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
     326  setPlaceholderText (tr ("Search..."));
     327#endif
     328}
     329
     330void
     331FilterBarLineEdit::resizeEvent (QResizeEvent * event)
    258332{
    259333  QLineEdit::resizeEvent (event);
     
    262336  const int frameWidth = style ()->pixelMetric (QStyle::PM_DefaultFrameWidth);
    263337  const QRect editRect = rect();
    264   const QSize buttonSizeHint = myClearButton->sizeHint ();
    265 
    266   myClearButton->move (editRect.right () - frameWidth - buttonSizeHint.width (),
    267                        editRect.top () + (editRect.height () - buttonSizeHint.height ()) / 2);
     338  const QSize buttonSize = myClearButton->size ();
     339
     340  myClearButton->move (editRect.right () - frameWidth - buttonSize.width (),
     341                       editRect.top () + (editRect.height () - buttonSize.height ()) / 2);
    268342#endif
    269343}
    270344
    271 void FilterBarLineEdit::updateClearButtonVisibility ()
     345void
     346FilterBarLineEdit::updateClearButtonVisibility ()
    272347{
    273348#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
     
    289364  c->setItemDelegate (delegate);
    290365
    291   QPixmap blankPixmap (c->iconSize ());
    292   blankPixmap.fill (Qt::transparent);
    293   QIcon blankIcon (blankPixmap);
    294 
    295366  QStandardItemModel * model = new QStandardItemModel (this);
    296367
     
    302373  delegate->setSeparator (model, model->index (1, 0));
    303374
    304   row = new QStandardItem (QIcon::fromTheme ("system-run", blankIcon), tr ("Active"));
     375  row = new QStandardItem (QIcon::fromTheme ("system-run"), tr ("Active"));
    305376  row->setData (FilterMode::SHOW_ACTIVE, ActivityRole);
    306377  model->appendRow (row);
    307378
    308   row = new QStandardItem (QIcon::fromTheme ("go-down", blankIcon), tr ("Downloading"));
     379  row = new QStandardItem (QIcon::fromTheme ("go-down"), tr ("Downloading"));
    309380  row->setData (FilterMode::SHOW_DOWNLOADING, ActivityRole);
    310381  model->appendRow (row);
    311382
    312   row = new QStandardItem (QIcon::fromTheme ("go-up", blankIcon), tr ("Seeding"));
     383  row = new QStandardItem (QIcon::fromTheme ("go-up"), tr ("Seeding"));
    313384  row->setData (FilterMode::SHOW_SEEDING, ActivityRole);
    314385  model->appendRow (row);
    315386
    316   row = new QStandardItem (QIcon::fromTheme ("media-playback-pause", blankIcon), tr ("Paused"));
     387  row = new QStandardItem (QIcon::fromTheme ("media-playback-pause"), tr ("Paused"));
    317388  row->setData (FilterMode::SHOW_PAUSED, ActivityRole);
    318389  model->appendRow (row);
    319390
    320   row = new QStandardItem (QIcon::fromTheme ("dialog-ok", blankIcon), tr ("Finished"));
     391  row = new QStandardItem (QIcon::fromTheme ("dialog-ok"), tr ("Finished"));
    321392  row->setData (FilterMode::SHOW_FINISHED, ActivityRole);
    322393  model->appendRow (row);
    323394
    324   row = new QStandardItem (QIcon::fromTheme ("view-refresh", blankIcon), tr ("Verifying"));
     395  row = new QStandardItem (QIcon::fromTheme ("view-refresh"), tr ("Verifying"));
    325396  row->setData (FilterMode::SHOW_VERIFYING, ActivityRole);
    326397  model->appendRow (row);
    327398
    328   row = new QStandardItem (QIcon::fromTheme ("process-stop", blankIcon), tr ("Error"));
     399  row = new QStandardItem (QIcon::fromTheme ("process-stop"), tr ("Error"));
    329400  row->setData (FilterMode::SHOW_ERROR, ActivityRole);
    330401  model->appendRow (row);
     
    484555{
    485556  QHBoxLayout * h = new QHBoxLayout (this);
    486   const int hmargin = qMax (static_cast<int> (HIG::PAD), style ()->pixelMetric (QStyle::PM_LayoutHorizontalSpacing));
     557  h->setContentsMargins (3, 3, 3, 3);
    487558
    488559  myCountLabel = new QLabel (this);
    489   h->setSpacing (0);
    490   h->setContentsMargins (2, 2, 2, 2);
    491560  h->addWidget (myCountLabel);
    492   h->addSpacing (hmargin);
    493561
    494562  myActivityCombo = createActivityCombo ();
    495   h->addWidget (myActivityCombo, 1);
    496   h->addSpacing (hmargin);
     563  myActivityCombo->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
     564  h->addWidget (myActivityCombo);
    497565
    498566  myTrackerModel = new QStandardItemModel (this);
    499567  myTrackerCombo = createTrackerCombo (myTrackerModel);
    500   h->addWidget (myTrackerCombo, 1);
    501   h->addSpacing (hmargin*2);
     568  h->addWidget (myTrackerCombo);
    502569
    503570  myLineEdit = new FilterBarLineEdit (this);
  • trunk/qt/filterbar.h

    r14411 r14445  
    5555    int currentCount () const;
    5656
     57    virtual QSize minimumSizeHint () const;
     58    virtual QSize sizeHint () const;
     59
    5760  protected:
    5861    virtual void paintEvent (QPaintEvent * e);
     62
     63  private:
     64    QSize calculateSize (const QSize& textSize, const QSize& countSize) const;
    5965};
    6066
  • trunk/qt/mainwin.ui

    r14397 r14445  
    1313  <property name="windowTitle">
    1414   <string>Transmission</string>
     15  </property>
     16  <property name="unifiedTitleAndToolBarOnMac">
     17   <bool>true</bool>
    1518  </property>
    1619  <widget class="QWidget" name="centralwidget">
  • trunk/qt/translations/transmission_en.ts

    r14434 r14445  
    594594    <name>FilterBar</name>
    595595    <message>
    596         <location filename="../filterbar.cc" line="+297"/>
     596        <location filename="../filterbar.cc" line="+368"/>
    597597        <location line="+160"/>
    598598        <source>All</source>
     
    625625    </message>
    626626    <message numerus="yes">
    627         <location line="+349"/>
     627        <location line="+345"/>
    628628        <source>Show %Ln of:</source>
    629629        <translation type="unfinished">
     
    633633    </message>
    634634    <message>
    635         <location line="-345"/>
     635        <location line="-341"/>
    636636        <source>Verifying</source>
    637637        <translation type="unfinished"></translation>
     
    643643    </message>
    644644    <message>
    645         <location line="+339"/>
     645        <location line="+335"/>
    646646        <source>Show:</source>
     647        <translation type="unfinished"></translation>
     648    </message>
     649</context>
     650<context>
     651    <name>FilterBarLineEdit</name>
     652    <message>
     653        <location line="-408"/>
     654        <source>Search...</source>
    647655        <translation type="unfinished"></translation>
    648656    </message>
     
    808816    </message>
    809817    <message>
    810         <location line="+151"/>
     818        <location line="+154"/>
    811819        <source>&amp;Torrent</source>
    812820        <translation type="unfinished"></translation>
  • trunk/qt/translations/transmission_es.ts

    r14434 r14445  
    596596    <name>FilterBar</name>
    597597    <message>
    598         <location filename="../filterbar.cc" line="+297"/>
     598        <location filename="../filterbar.cc" line="+368"/>
    599599        <location line="+160"/>
    600600        <source>All</source>
     
    637637    </message>
    638638    <message>
    639         <location line="+339"/>
     639        <location line="+335"/>
    640640        <source>Show:</source>
    641641        <translation>Mostrar:</translation>
     
    648648            <numerusform></numerusform>
    649649        </translation>
     650    </message>
     651</context>
     652<context>
     653    <name>FilterBarLineEdit</name>
     654    <message>
     655        <location line="-410"/>
     656        <source>Search...</source>
     657        <translation type="unfinished"></translation>
    650658    </message>
    651659</context>
     
    810818    </message>
    811819    <message>
    812         <location line="+151"/>
     820        <location line="+154"/>
    813821        <source>&amp;Torrent</source>
    814822        <translation>&amp;Torrent</translation>
  • trunk/qt/translations/transmission_eu.ts

    r14434 r14445  
    594594    <name>FilterBar</name>
    595595    <message>
    596         <location filename="../filterbar.cc" line="+297"/>
     596        <location filename="../filterbar.cc" line="+368"/>
    597597        <location line="+160"/>
    598598        <source>All</source>
     
    635635    </message>
    636636    <message>
    637         <location line="+339"/>
     637        <location line="+335"/>
    638638        <source>Show:</source>
    639639        <translation>Erakutsi:</translation>
     
    646646            <numerusform>Erakutsi %Ln -&gt;:</numerusform>
    647647        </translation>
     648    </message>
     649</context>
     650<context>
     651    <name>FilterBarLineEdit</name>
     652    <message>
     653        <location line="-410"/>
     654        <source>Search...</source>
     655        <translation type="unfinished"></translation>
    648656    </message>
    649657</context>
     
    808816    </message>
    809817    <message>
    810         <location line="+151"/>
     818        <location line="+154"/>
    811819        <source>&amp;Torrent</source>
    812820        <translation>&amp;Torrenta</translation>
  • trunk/qt/translations/transmission_fr.ts

    r14434 r14445  
    594594    <name>FilterBar</name>
    595595    <message>
    596         <location filename="../filterbar.cc" line="+297"/>
     596        <location filename="../filterbar.cc" line="+368"/>
    597597        <location line="+160"/>
    598598        <source>All</source>
     
    635635    </message>
    636636    <message>
    637         <location line="+339"/>
     637        <location line="+335"/>
    638638        <source>Show:</source>
    639639        <translation>Afficher:</translation>
     
    646646            <numerusform>Afficher %Ln sur:</numerusform>
    647647        </translation>
     648    </message>
     649</context>
     650<context>
     651    <name>FilterBarLineEdit</name>
     652    <message>
     653        <location line="-410"/>
     654        <source>Search...</source>
     655        <translation type="unfinished"></translation>
    648656    </message>
    649657</context>
     
    808816    </message>
    809817    <message>
    810         <location line="+151"/>
     818        <location line="+154"/>
    811819        <source>&amp;Torrent</source>
    812820        <translation>&amp;Torrent</translation>
  • trunk/qt/translations/transmission_hu.ts

    r14434 r14445  
    591591    <name>FilterBar</name>
    592592    <message>
    593         <location filename="../filterbar.cc" line="+297"/>
     593        <location filename="../filterbar.cc" line="+368"/>
    594594        <location line="+160"/>
    595595        <source>All</source>
     
    632632    </message>
    633633    <message>
    634         <location line="+339"/>
     634        <location line="+335"/>
    635635        <source>Show:</source>
    636636        <translation>Mutat:</translation>
     
    642642            <numerusform></numerusform>
    643643        </translation>
     644    </message>
     645</context>
     646<context>
     647    <name>FilterBarLineEdit</name>
     648    <message>
     649        <location line="-410"/>
     650        <source>Search...</source>
     651        <translation type="unfinished"></translation>
    644652    </message>
    645653</context>
     
    800808    </message>
    801809    <message>
    802         <location line="+151"/>
     810        <location line="+154"/>
    803811        <source>&amp;Torrent</source>
    804812        <translation>&amp;Torrent</translation>
  • trunk/qt/translations/transmission_kk.ts

    r14434 r14445  
    594594    <name>FilterBar</name>
    595595    <message>
    596         <location filename="../filterbar.cc" line="+297"/>
     596        <location filename="../filterbar.cc" line="+368"/>
    597597        <location line="+160"/>
    598598        <source>All</source>
     
    625625    </message>
    626626    <message numerus="yes">
    627         <location line="+349"/>
     627        <location line="+345"/>
    628628        <source>Show %Ln of:</source>
    629629        <translation type="unfinished">
     
    633633    </message>
    634634    <message>
    635         <location line="-345"/>
     635        <location line="-341"/>
    636636        <source>Verifying</source>
    637637        <translation>ТексерілуЎе</translation>
     
    643643    </message>
    644644    <message>
    645         <location line="+339"/>
     645        <location line="+335"/>
    646646        <source>Show:</source>
    647647        <translation>Көрсету:</translation>
     648    </message>
     649</context>
     650<context>
     651    <name>FilterBarLineEdit</name>
     652    <message>
     653        <location line="-408"/>
     654        <source>Search...</source>
     655        <translation type="unfinished"></translation>
    648656    </message>
    649657</context>
     
    808816    </message>
    809817    <message>
    810         <location line="+151"/>
     818        <location line="+154"/>
    811819        <source>&amp;Torrent</source>
    812820        <translation>&amp;ТПрреМт</translation>
  • trunk/qt/translations/transmission_lt.ts

    r14434 r14445  
    600600    <name>FilterBar</name>
    601601    <message>
    602         <location filename="../filterbar.cc" line="+304"/>
     602        <location filename="../filterbar.cc" line="+375"/>
    603603        <source>Active</source>
    604604        <translation>aktyvius</translation>
     
    621621    </message>
    622622    <message numerus="yes">
    623         <location line="+341"/>
     623        <location line="+337"/>
    624624        <source>Show %Ln of:</source>
    625625        <translation type="unfinished">
     
    630630    </message>
    631631    <message>
    632         <location line="-349"/>
     632        <location line="-345"/>
    633633        <source>Finished</source>
    634634        <translation>uÅŸbaigtus</translation>
     
    645645    </message>
    646646    <message>
    647         <location line="+355"/>
     647        <location line="+351"/>
    648648        <source>Show:</source>
    649649        <translation>Rodyti:</translation>
    650650    </message>
    651651    <message>
    652         <location line="-343"/>
     652        <location line="-339"/>
    653653        <source>Verifying</source>
    654654        <translation>tikrinamus</translation>
     655    </message>
     656</context>
     657<context>
     658    <name>FilterBarLineEdit</name>
     659    <message>
     660        <location line="-69"/>
     661        <source>Search...</source>
     662        <translation type="unfinished"></translation>
    655663    </message>
    656664</context>
     
    814822    <name>MainWindow</name>
    815823    <message>
    816         <location filename="../mainwin.ui" line="+595"/>
     824        <location filename="../mainwin.ui" line="+598"/>
    817825        <source>&amp;About</source>
    818826        <translation>&amp;Apie</translation>
     
    12331241    </message>
    12341242    <message>
    1235         <location line="-640"/>
     1243        <location line="-643"/>
    12361244        <source>Transmission</source>
    12371245        <translation>Transmission</translation>
    12381246    </message>
    12391247    <message>
    1240         <location line="+664"/>
     1248        <location line="+667"/>
    12411249        <source>Tray &amp;Icon</source>
    12421250        <translation>&amp;Piktograma praneÅ¡imų srityje</translation>
  • trunk/qt/translations/transmission_pt_BR.ts

    r14434 r14445  
    594594    <name>FilterBar</name>
    595595    <message>
    596         <location filename="../filterbar.cc" line="+297"/>
     596        <location filename="../filterbar.cc" line="+368"/>
    597597        <location line="+160"/>
    598598        <source>All</source>
     
    625625    </message>
    626626    <message numerus="yes">
    627         <location line="+349"/>
     627        <location line="+345"/>
    628628        <source>Show %Ln of:</source>
    629629        <translation type="unfinished">
     
    633633    </message>
    634634    <message>
    635         <location line="-345"/>
     635        <location line="-341"/>
    636636        <source>Verifying</source>
    637637        <translation type="unfinished"></translation>
     
    643643    </message>
    644644    <message>
    645         <location line="+339"/>
     645        <location line="+335"/>
    646646        <source>Show:</source>
     647        <translation type="unfinished"></translation>
     648    </message>
     649</context>
     650<context>
     651    <name>FilterBarLineEdit</name>
     652    <message>
     653        <location line="-408"/>
     654        <source>Search...</source>
    647655        <translation type="unfinished"></translation>
    648656    </message>
     
    808816    </message>
    809817    <message>
    810         <location line="+151"/>
     818        <location line="+154"/>
    811819        <source>&amp;Torrent</source>
    812820        <translation>Torrent</translation>
  • trunk/qt/translations/transmission_ru.ts

    r14434 r14445  
    602602    <name>FilterBar</name>
    603603    <message>
    604         <location filename="../filterbar.cc" line="+297"/>
     604        <location filename="../filterbar.cc" line="+368"/>
    605605        <location line="+160"/>
    606606        <source>All</source>
     
    633633    </message>
    634634    <message numerus="yes">
    635         <location line="+349"/>
     635        <location line="+345"/>
    636636        <source>Show %Ln of:</source>
    637637        <translation type="unfinished">
     
    642642    </message>
    643643    <message>
    644         <location line="-345"/>
     644        <location line="-341"/>
    645645        <source>Verifying</source>
    646646        <translation>ПрПверкО</translation>
     
    652652    </message>
    653653    <message>
    654         <location line="+339"/>
     654        <location line="+335"/>
    655655        <source>Show:</source>
    656656        <translation>  ППказать:</translation>
     657    </message>
     658</context>
     659<context>
     660    <name>FilterBarLineEdit</name>
     661    <message>
     662        <location line="-408"/>
     663        <source>Search...</source>
     664        <translation type="unfinished"></translation>
    657665    </message>
    658666</context>
     
    822830    </message>
    823831    <message>
    824         <location line="+151"/>
     832        <location line="+154"/>
    825833        <source>&amp;Torrent</source>
    826834        <translation>&amp;ТПрреМт</translation>
  • trunk/qt/translations/transmission_uk.ts

    r14434 r14445  
    605605    <name>FilterBar</name>
    606606    <message>
    607         <location filename="../filterbar.cc" line="+297"/>
     607        <location filename="../filterbar.cc" line="+368"/>
    608608        <location line="+160"/>
    609609        <source>All</source>
     
    636636    </message>
    637637    <message numerus="yes">
    638         <location line="+349"/>
     638        <location line="+345"/>
    639639        <source>Show %Ln of:</source>
    640640        <translation>
     
    645645    </message>
    646646    <message>
    647         <location line="-345"/>
     647        <location line="-341"/>
    648648        <source>Verifying</source>
    649649        <translation>Перевірка</translation>
     
    655655    </message>
    656656    <message>
    657         <location line="+339"/>
     657        <location line="+335"/>
    658658        <source>Show:</source>
    659659        <translation>ППказуватО:</translation>
     660    </message>
     661</context>
     662<context>
     663    <name>FilterBarLineEdit</name>
     664    <message>
     665        <location line="-408"/>
     666        <source>Search...</source>
     667        <translation type="unfinished"></translation>
    660668    </message>
    661669</context>
     
    827835    </message>
    828836    <message>
    829         <location line="+151"/>
     837        <location line="+154"/>
    830838        <source>&amp;Torrent</source>
    831839        <translation>&amp;ТПреМт</translation>
Note: See TracChangeset for help on using the changeset viewer.