← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to lokalize/src/editortab.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
lokalize/src/editortab.cpp
659
659
    connect( m_syncView, SIGNAL(signalNextChangedAvailable(bool)),action,SLOT(setEnabled(bool)) );
660
660
    m_syncView->addAction(action);
661
661
 
 
662
    action = sync1->addAction("merge_nextapproved",m_syncView,SLOT(gotoNextChangedApproved()));
 
663
    action->setText(i18nc("@action:inmenu","Next different approved"));
 
664
    action->setShortcut(Qt::ALT+Qt::META+Qt::Key_Down);
 
665
    connect( m_syncView, SIGNAL(signalNextChangedAvailable(bool)),action,SLOT(setEnabled(bool)) );
 
666
    m_syncView->addAction(action);
 
667
 
662
668
    action = sync1->addAction("merge_accept",m_syncView,SLOT(mergeAccept()));
663
669
    action->setText(i18nc("@action:inmenu","Copy from merging source"));
664
670
    action->setShortcut(Qt::ALT+Qt::Key_Return);
801
807
    {
802
808
        //Prevent crashes
803
809
        Project::instance()->model()->weaver()->suspend();
804
 
        url=KFileDialog::getOpenFileName(baseUrl, "text/x-gettext-translation text/x-gettext-translation-template application/x-xliff",SettingsController::instance()->mainWindowPtr());
 
810
        url=KFileDialog::getOpenFileName(baseUrl, "text/x-gettext-translation text/x-gettext-translation-template application/x-xliff application/x-linguist",SettingsController::instance()->mainWindowPtr());
805
811
        Project::instance()->model()->weaver()->resume();
806
812
        //TODO application/x-xliff, windows: just extensions
807
813
        //originalPath=url.path(); never used
976
982
    }
977
983
}
978
984
 
979
 
void EditorTab::gotoEntry(DocPosition pos,int selection)
 
985
void EditorTab::gotoEntry(DocPosition pos, int selection)
980
986
{
981
987
    //specially for dbus users
982
988
    if (pos.entry>=m_catalog->numberOfEntries()||pos.entry<0)
1005
1011
    if (pos.part==DocPosition::UndefPart)
1006
1012
        m_currentPos.part=DocPosition::Target;
1007
1013
 
1008
 
    QTime time;
1009
 
    time.start();
 
1014
    //QTime time; time.start();
1010
1015
 
1011
1016
    if (newEntry)
1012
1017
    {
1412
1417
void EditorTab::addEntryNote(int entry, const QString& note){m_notesView->addNote(entry, note);}
1413
1418
void EditorTab::addTemporaryEntryNote(int entry, const QString& note){m_notesView->addTemporaryEntryNote(entry, note);}
1414
1419
 
 
1420
void EditorTab::addAlternateTranslation(int entry, const QString& translation){m_altTransView->addAlternateTranslation(entry, translation);}
 
1421
void EditorTab::addTemporaryAlternateTranslation(int entry, const QString& translation){m_altTransView->addAlternateTranslation(entry, translation);}
1415
1422
void EditorTab::attachAlternateTranslationFile(const QString& path){m_altTransView->attachAltTransFile(path);}
1416
1423
 
1417
1424
void EditorTab::setEntryTarget(int entry, int form, const QString& content)