← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/advancedrename/common/tooltipcreator.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/advancedrename/common/tooltipcreator.cpp
140
140
    optionsRegExp.setMinimal(true);
141
141
 
142
142
    result.replace(optionsRegExp, QString("<i><font color=\"%1\">\\1</font></i>")
143
 
                                          .arg(ThemeEngine::instance()->textSpecialRegColor().name()));
 
143
                   .arg(ThemeEngine::instance()->textSpecialRegColor().name()));
144
144
    return result;
145
145
}
146
146
 
150
150
    QString templateStr = QString("<tr><td style=\"background-color: %1; padding:0.25em;\" colspan=\"2\">"
151
151
                                  "<nobr><font color=\"%2\"><center><b>%3"
152
152
                                  "</b></center></font></nobr></td></tr>")
153
 
                                  .arg(ThemeEngine::instance()->thumbSelColor().name())
154
 
                                  .arg(ThemeEngine::instance()->textSelColor().name());
 
153
                          .arg(ThemeEngine::instance()->thumbSelColor().name())
 
154
                          .arg(ThemeEngine::instance()->textSelColor().name());
155
155
 
156
156
    result += templateStr.arg(str);
157
157
    return result;
170
170
                              "<td style=\"background-color: %1;\">"
171
171
                              "<font color=\"%2\"><b>&nbsp;%3&nbsp;</b></font></td>"
172
172
                              "<td>&nbsp;%4&nbsp;</td></tr>")
173
 
                              .arg(ThemeEngine::instance()->baseColor().name())
174
 
                              .arg(ThemeEngine::instance()->textRegColor().name())
175
 
                              .arg(markOption(token->id()))
176
 
                              .arg(markOption(token->description()));
 
173
                      .arg(ThemeEngine::instance()->baseColor().name())
 
174
                      .arg(ThemeEngine::instance()->textRegColor().name())
 
175
                      .arg(markOption(token->id()))
 
176
                      .arg(markOption(token->description()));
177
177
        }
178
178
    }
179
179