Changeset View
Changeset View
Standalone View
Standalone View
krusader/krslots.cpp
Show First 20 Lines • Show All 167 Lines • ▼ Show 20 Line(s) | 166 | } else if (lstActive.count() == 2) { | |||
---|---|---|---|---|---|
168 | name1 = ACTIVE_PANEL->func->files()->getUrl(lstActive[0]); | 168 | name1 = ACTIVE_PANEL->func->files()->getUrl(lstActive[0]); | ||
169 | name2 = ACTIVE_PANEL->func->files()->getUrl(lstActive[1]); | 169 | name2 = ACTIVE_PANEL->func->files()->getUrl(lstActive[1]); | ||
170 | } else if (ACTIVE_PANEL->otherPanel()->func->files()->getFileItem(ACTIVE_VIEW->getCurrentItem())) { | 170 | } else if (ACTIVE_PANEL->otherPanel()->func->files()->getFileItem(ACTIVE_VIEW->getCurrentItem())) { | ||
171 | // next try: is in the other panel a file with the same name? | 171 | // next try: is in the other panel a file with the same name? | ||
172 | name1 = ACTIVE_PANEL->func->files()->getUrl(ACTIVE_VIEW->getCurrentItem()); | 172 | name1 = ACTIVE_PANEL->func->files()->getUrl(ACTIVE_VIEW->getCurrentItem()); | ||
173 | name2 = ACTIVE_PANEL->otherPanel()->func->files()->getUrl(ACTIVE_VIEW->getCurrentItem()); | 173 | name2 = ACTIVE_PANEL->otherPanel()->func->files()->getUrl(ACTIVE_VIEW->getCurrentItem()); | ||
174 | } else { | 174 | } else { | ||
175 | // if we got here, then we can't be sure what file to diff | 175 | // if we got here, then we can't be sure what file to diff | ||
176 | KMessageBox::detailedError(0, i18n("Do not know which files to compare."), "<qt>" + i18n("To compare two files by content, you can either:<ul><li>Select one file in the left panel, and one in the right panel.</li><li>Select exactly two files in the active panel.</li><li>Make sure there is a file in the other panel, with the same name as the current file in the active panel.</li></ul>") + "</qt>"); | 176 | KMessageBox::sorry(0, "<qt>" + i18n("Do not know which files to compare.") + "<br/><br/>" + i18n("To compare two files by content, you can either:<ul><li>Select one file in the left panel, and one in the right panel.</li><li>Select exactly two files in the active panel.</li><li>Make sure there is a file in the other panel, with the same name as the current file in the active panel.</li></ul>") + "</qt>"); | ||
safaalfulaij: Why the puzzle string?
Why not using KUIT?
And I don't think we need `<qt>` anymore after Qt3 | |||||
I think this CR is good enough as a bug fix. For the <qt>, KUIT or other refactoring, it should go to a separate CR that updates all the corresponding places in the project. nmel: I think this CR is good enough as a bug fix. For the `<qt>`, KUIT or other refactoring, it… | |||||
177 | 177 | | |||
178 | return; | 178 | return; | ||
179 | } | 179 | } | ||
180 | 180 | | |||
181 | // else implied: all ok, let's call an external program to compare files | 181 | // else implied: all ok, let's call an external program to compare files | ||
182 | // but if any of the files isn't local, download it first | 182 | // but if any of the files isn't local, download it first | ||
183 | compareContent(name1, name2); | 183 | compareContent(name1, name2); | ||
184 | } | 184 | } | ||
▲ Show 20 Lines • Show All 563 Lines • Show Last 20 Lines |
Why the puzzle string?
Why not using KUIT?
And I don't think we need <qt> anymore after Qt3