Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Eti

By: a guest on Feb 20th, 2010  |  syntax: None  |  size: 4.40 KB  |  hits: 186  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. Index: kanagram/src/newstuff.cpp
  2. ===================================================================
  3. --- kanagram/src/newstuff.cpp   (Revision 1092321)
  4. +++ kanagram/src/newstuff.cpp   (Arbeitskopie)
  5.  -25,7 +25,8 @@
  6.  #include <qpushbutton.h>
  7.  
  8.  #include <kdebug.h>
  9. -#include <knewstuff2/engine.h>
  10. +#include <knewstuff3/downloaddialog.h>
  11. +
  12.  #include <klocale.h>
  13.  
  14.  #include <sharedkvtmlfiles.h>
  15.  -35,20 +36,25 @@
  16.  NewStuff::NewStuff(QWidget *parent):QDialog(parent)
  17.  {
  18.      setupUi(this);
  19. -    m_engine = new KNS::Engine();
  20.  }
  21.  
  22.  NewStuff::~NewStuff()
  23.  {
  24. -    delete m_engine;
  25. +//     delete m_engine;
  26.  }
  27.  
  28.  void NewStuff::on_btnGetNew_clicked()
  29.  {
  30. -    KNS::Entry::List entries = m_engine->download();
  31. -    // we need to delete the entry* items in the returned list
  32. -    qDeleteAll(entries);
  33. +//     KNS::Entry::List entries = m_engine->download();
  34. +//     // we need to delete the entry* items in the returned list
  35. +//     qDeleteAll(entries);
  36. +//     SharedKvtmlFiles::sortDownloadedFiles();
  37. +//     KStandardDirs::locate( "data",  "marble/marble.knsrc" )
  38. +                                              
  39. +    KNS3::DownloadDialog hotNewStuffdialog( "kanagram.knsrc" );
  40. +    hotNewStuffdialog.exec();
  41.      SharedKvtmlFiles::sortDownloadedFiles();
  42. +    
  43.  }
  44.  
  45.  #include "newstuff.moc"
  46. Index: kanagram/src/newstuff.h
  47. ===================================================================
  48. --- kanagram/src/newstuff.h     (Revision 1092321)
  49. +++ kanagram/src/newstuff.h     (Arbeitskopie)
  50.  -24,9 +24,9 @@
  51.  
  52.  #include "ui_newstuffwidget.h"
  53.  
  54. -namespace KNS
  55. +namespace KNS3
  56.  {
  57. -    class Engine;
  58. +    class DownloadDialog;
  59.  }
  60.  
  61.  /** settings page to get new vocabularies through KNewStuff */
  62.  -45,9 +45,6 @@
  63.            * invokes the KNewStuff dialog for downloading
  64.            */
  65.          void on_btnGetNew_clicked();
  66. -
  67. -    private:
  68. -        KNS::Engine * m_engine;
  69.  };
  70.  
  71.  #endif
  72. Index: kanagram/src/kanagram.knsrc
  73. ===================================================================
  74. --- kanagram/src/kanagram.knsrc (Revision 1092321)
  75. +++ kanagram/src/kanagram.knsrc (Arbeitskopie)
  76.  -1,4 +1,4 @@
  77. -[KNewStuff2]
  78. +[KNewStuff3]
  79.  ProvidersUrl=http://data.kstuff.org/cgi-bin/hotstuff-provider?site=kanagram-dxs
  80.  TargetDir=kvtml
  81.  Uncompress=true
  82. Index: kanagram/src/kanagram.cpp
  83. ===================================================================
  84. --- kanagram/src/kanagram.cpp   (Revision 1092321)
  85. +++ kanagram/src/kanagram.cpp   (Arbeitskopie)
  86.  -44,6 +44,7 @@
  87.  #include <KStandardDirs>
  88.  #include <KStandardShortcut>
  89.  #include <kdeversion.h>
  90. +#include <knewstuff3/downloaddialog.h>
  91.  
  92.  #include <sharedkvtmlfiles.h>
  93.  
  94.  -51,7 +52,7 @@
  95.  #include "kanagramsettings.h"
  96.  #include "mainsettings.h"
  97.  #include "vocabsettings.h"
  98. -#include "newstuff.h"
  99. +// #include "newstuff.h"
  100.  #include "libkdeedu/kdeeduui/kedufontutils.h"
  101.  
  102.  static const char* m_textRevealWord = I18N_NOOP("reveal word");
  103.  -849,8 +850,17 @@
  104.          connect(m_shortcutsEditor, SIGNAL(keyChange()), this, SLOT(slotEnableApplyButton()));
  105.  
  106.          // and add the KNS page
  107. -        m_configDialog->addPage( new NewStuff( m_configDialog ), i18n("New Stuff"), "get-hot-new-stuff" );
  108. +//         m_configDialog->addPage( new NewStuff( m_configDialog ), i18n("New Stuff"), "get-hot-new-stuff" );
  109. +      
  110. +//     QWidget *hotNewStuffWidget = new QWidget(m_configDialog);
  111. +       KNS3::DownloadDialog *hotNewStuffDialog = new KNS3::DownloadDialog("kanagram.knsrc", m_configDialog);
  112. +       m_configDialog->addPage(hotNewStuffDialog , i18n("New Stuff"), "get-hot-new-stuff" );
  113. +      
  114. +       //      m_configDialog->addPage(new KNS3::DownloadDialog("kanagram.knsrc", m_configDialog) , i18n("New Stuff"), "get-hot-new-stuff" );
  115.  
  116. +//     m_configDialog->
  117. +
  118. +
  119.          m_configDialog->setHelp("kanagram/index.html");
  120.          m_configDialog->show();
  121.      }
  122. Index: kanagram/src/CMakeLists.txt
  123. ===================================================================
  124. --- kanagram/src/CMakeLists.txt (Revision 1092321)
  125. +++ kanagram/src/CMakeLists.txt (Arbeitskopie)
  126.  -29,7 +29,7 @@
  127.  kde4_add_executable(kanagram ${kanagram_SRCS})
  128.  add_dependencies(kanagram kvtml_data)
  129.  
  130. -target_link_libraries(kanagram  ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_PHONON_LIBS} ${QT_QTXML_LIBRARY} keduvocdocument kdeeduui )
  131. +target_link_libraries(kanagram  ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_PHONON_LIBS} ${QT_QTXML_LIBRARY} keduvocdocument kdeeduui )
  132.  
  133.  install(TARGETS kanagram  ${INSTALL_TARGETS_DEFAULT_ARGS} )
create a new version of this paste RAW Paste Data