piklab-svn Mailing List for Piklab (Page 3)

IDE for PIC microcontrollers

Brought to you by: azhyd

piklab-svn — Subversion Commits

You can subscribe to this list here.

2012	_Jan	_Feb	_Mar (16)	_Apr (22)	_May (8)	_Jun (24)	_Jul (18)	_Aug (15)	_Sep (4)	_Oct (24)	_Nov (2)	_Dec

Flat | Threaded

<< < 1 2 3 4 5 6 > >> (Page 3 of 6)

[Piklab-svn] SF.net SVN: piklab:[2932] trunk/piklab_kde4/src/progs/icd2/base/icd2_serial .cpp

From: <az...@us...> - 2012-07-14 18:50:16

Revision: 2932
          http://piklab.svn.sourceforge.net/piklab/?rev=2932&view=rev
Author:   azhyd
Date:     2012-07-14 18:50:09 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
add debug messages

Modified Paths:
--------------
    trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp

Modified: trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp	2012-07-14 18:43:06 UTC (rev 2931)
+++ trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp	2012-07-14 18:50:09 UTC (rev 2932)
@@ -31,14 +31,19 @@
 {
   if ( !static_cast<SerialPort *>(_port)->open(Port::Serial::S19200) ) return false;
   if ( !reset() ) return false;
+  log(Log::DebugLevel::Max, QString("Send: \"%1\"").arg("Z"));
   if ( !_port->send("Z", 1) ) return false;
   QString s;
   if ( !_port->receive(4, s) ) return false;
+  log(Log::DebugLevel::Max, QString("Received: \"%1\"").arg(s));
+
   if ( !reset() ) return false;
   for (uint i = 0; ; ++i) {
-    QByteArray a = toAscii(mode);
+    const QByteArray a = toAscii(mode);
+    log(Log::DebugLevel::Max, QString("Send: \"%1\"").arg(mode));
     if ( !_port->send(a.data(), a.count()) ) return false;
     if ( !_port->receive(1, s) ) return false;
+    log(Log::DebugLevel::Max, QString("Received: \"%1\"").arg(s));
     if ( s.upper()==mode ) {
       break;
     }
@@ -55,6 +60,7 @@
 
 bool Icd2::SerialHardware::reset()
 {
+  log(Log::DebugLevel::Max, QString("Reset icd2 serial port"));
   static_cast<Port::Serial *>(_port)->setPinOn(Port::Serial::DTR, false, Port::PositiveLogic); // Trigger DTR to reset icd2
   Port::msleep(10);
   static_cast<Port::Serial *>(_port)->setPinOn(Port::Serial::DTR, true, Port::PositiveLogic); // remove reset

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2931] trunk/piklab_kde4/src/progs/icd2/base/icd2_serial .cpp

From: <az...@us...> - 2012-07-14 18:43:13

Revision: 2931
          http://piklab.svn.sourceforge.net/piklab/?rev=2931&view=rev
Author:   azhyd
Date:     2012-07-14 18:43:06 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
retries 10 times when setting serial port mode for icd2

Modified Paths:
--------------
    trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp

Modified: trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp	2012-07-13 05:55:00 UTC (rev 2930)
+++ trunk/piklab_kde4/src/progs/icd2/base/icd2_serial.cpp	2012-07-14 18:43:06 UTC (rev 2931)
@@ -35,12 +35,18 @@
   QString s;
   if ( !_port->receive(4, s) ) return false;
   if ( !reset() ) return false;
-  QByteArray a = toAscii(mode);
-  if ( !_port->send(a.data(), a.count()) ) return false;
-  if ( !_port->receive(1, s) ) return false;
-  if ( s.upper()!=mode ) {
-    log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").arg(mode));
-    return false;
+  for (uint i = 0; ; ++i) {
+    QByteArray a = toAscii(mode);
+    if ( !_port->send(a.data(), a.count()) ) return false;
+    if ( !_port->receive(1, s) ) return false;
+    if ( s.upper()==mode ) {
+      break;
+    }
+    if (i == 10) {
+      log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").arg(mode));
+      return false;
+    }
+    Port::msleep(100);
   }
   //log(Log::Debug, "set fast speed");
   //if ( !setFastSpeed() ) return false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2930] trunk/piklab_kde4

From: <az...@us...> - 2012-07-13 05:55:08

Revision: 2930
          http://piklab.svn.sourceforge.net/piklab/?rev=2930&view=rev
Author:   azhyd
Date:     2012-07-13 05:55:00 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
+ add menu entry configure editor
+ do not power target with ICD2 if device nominal vdd is not 5V

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/data/app_data/piklabui.rc
    trunk/piklab_kde4/src/data/jal-pic.xml
    trunk/piklab_kde4/src/devices/pic/base/pic.cpp
    trunk/piklab_kde4/src/devices/pic/base/pic.h
    trunk/piklab_kde4/src/libgui/text_editor.cpp
    trunk/piklab_kde4/src/libgui/text_editor.h
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/libgui/toplevel.h
    trunk/piklab_kde4/src/progs/icd2/base/icd2.cpp
    trunk/piklab_kde4/test/gputils/blinker/blinker.piklab
    trunk/piklab_kde4/test/jalv2/test.piklab

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/Changelog	2012-07-13 05:55:00 UTC (rev 2930)
@@ -1,7 +1,9 @@
-0.16.2 (3 July 2012)
+0.16.2 (12 July 2012)
 * fixed toolchain output when executable cannot be found
-* fixed parsing for jalv2 [reported by biglacko]
+* fixed parsing for jalv2
 * fixed template generator for jalv2
+* do not set target power with ICD2 if device nominal vdd is not 5V
+* add menu entry to configure editor
 
 0.16.1 (1 July 2012)
 * fixed command-line utilities compilation with Qt only
@@ -78,7 +80,7 @@
  * added support for dspicc compiler
  * fixed crash when configuring custom programmer
  * added options to custom programmer [requested by Alberto Maccioni]
- * fixed crash when using "stop" command [reported by biglacko]
+ * fixed crash when using "stop" command [reported by Nagy László]
  * added "khexterm" in external tools [authored by Javier Fernando Vargas G.]
  * fixed the output of piklab-hex "compare" command
 

Modified: trunk/piklab_kde4/src/data/app_data/piklabui.rc
===================================================================
--- trunk/piklab_kde4/src/data/app_data/piklabui.rc	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/data/app_data/piklabui.rc	2012-07-13 05:55:00 UTC (rev 2930)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="piklab" version="53">
+<kpartgui name="piklab" version="54">
 
 <MenuBar>
 
@@ -161,6 +161,7 @@
   <Menu name="settings"><text>&amp;Settings</text>
     <Action name="options_configure_toolchains" append="configure_merge" />
     <Action name="options_configure_programmers" append="configure_merge" />
+    <Action name="options_configure_editor" append="configure_merge" />
   </Menu>
 
   <Menu name="help" noMerge="1"><text>&amp;Help</text>

Modified: trunk/piklab_kde4/src/data/jal-pic.xml
===================================================================
--- trunk/piklab_kde4/src/data/jal-pic.xml	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/data/jal-pic.xml	2012-07-13 05:55:00 UTC (rev 2930)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="XPicJal" version="0.1" kateversion="2.0" section="Sources"
+<language name="XPicJal" version="0.2" kateversion="2.0" section="Sources"
     extensions="*.jal" mimetype="text/x-PicJal">
 
   <highlighting>
@@ -37,7 +37,7 @@
     <contexts>
 
       <context name="normal" attribute="Normal Text" lineEndContext="#stay">
-        <RegExpr attribute="Proprocessor" context="#stay" String="include.*"/>
+        <RegExpr attribute="Preprocessor" context="#stay" String="include.*"/>
         <RegExpr attribute="Preprocessor" context="#stay" String="pragma.*"/>
         <keyword attribute="Directives" context="#stay" String="directives"/>
         <keyword attribute="Instructions" context="#stay" String="instructions"/>

Modified: trunk/piklab_kde4/src/devices/pic/base/pic.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic.cpp	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/devices/pic/base/pic.cpp	2012-07-13 05:55:00 UTC (rev 2930)
@@ -37,18 +37,17 @@
 //  name family_label nbBytesPC nbBytesWord nbBitsRegister registerBankLength
 //  {Code, Cal, UserID, DevId, Conf, EEPROM, DebugVec, HardStack, CalBackup, Program Executive}
 //  properties nominalVdd
-  { "baseline", I18N_NOOP("Baseline Family"),  0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 },  NoArchitectureProperty, 5.0 }, // 9, 10, 11 or 12-bit program counter
-  { "midrange", I18N_NOOP("Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
-  { "emidrange", I18N_NOOP("Enhance Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
-  { "17C", I18N_NOOP("17C Family"),      16, 2, 8, 0x100, { 16,  0,  0,  0, 16,  8,  0,  0,  0,  0 },  RandomMemoryAccess,     5.0 },
-  { "18C", I18N_NOOP("18C Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess, 5.0 },
-  { "18F", I18N_NOOP("18F Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess | MaybeSelfWrite, 5.0 },
-  { "18J", I18N_NOOP("18J Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess | SelfWrite | JFamily, 3.3 },
-
-  { "24F", I18N_NOOP("24F Family"),      23, 4, 16, 0x800, { 24,  0,  0, 16, 16,  0, 24,  0,  0, 24 }, RandomMemoryAccess | SelfWrite | JFamily, 3.3 },
-  { "24H", I18N_NOOP("24H Family"),      23, 4, 16, 0x800, { 24,  0,  8, 16,  8,  0, 24,  0,  0, 24 }, RandomMemoryAccess | SelfWrite | JFamily, 3.3 },
-  { "30F", I18N_NOOP("30F Family"),      23, 4, 16, 0xA00, { 24,  0, 24, 16, 16, 16, 24,  0,  0, 24 }, RandomMemoryAccess | SelfWrite, 5.0 }, // dsPIC: eeprom max = 2 kwords = 4 kbytes
-  { "33F", I18N_NOOP("33F Family"),      23, 4, 16, 0x800, { 24,  0, 16, 16, 16,  0, 24,  0,  0, 24 }, RandomMemoryAccess | SelfWrite | JFamily, 3.3 }
+  { "baseline",  I18N_NOOP("Baseline Family"),           0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 }, NoArchitectureProperty,                          5.0 }, // 9, 10, 11 or 12-bit program counter
+  { "midrange",  I18N_NOOP("Mid-Range Family"),         13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 }, MaybeSelfWrite,                                  5.0 }, // max eeprom: 256 words
+  { "emidrange", I18N_NOOP("Enhance Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 }, MaybeSelfWrite,                                  5.0 }, // max eeprom: 256 words
+  { "17C",       I18N_NOOP("17C Family"),               16, 2, 8, 0x100, { 16,  0,  0,  0, 16,  8,  0,  0,  0,  0 }, RandomMemoryAccess,                              5.0 },
+  { "18C",       I18N_NOOP("18C Family"),               21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 }, PackedHex | RandomMemoryAccess,                  5.0 },
+  { "18F",       I18N_NOOP("18F Family"),               21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 }, PackedHex | RandomMemoryAccess | MaybeSelfWrite, 5.0 },
+  { "18J",       I18N_NOOP("18J Family"),               21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 }, PackedHex | RandomMemoryAccess | SelfWrite,      3.3 },
+  { "24F",       I18N_NOOP("24F Family"),               23, 4, 16, 0x800, { 24,  0,  0, 16, 16,  0, 24, 0,  0, 24 }, RandomMemoryAccess | SelfWrite,                  3.3 },
+  { "24H",       I18N_NOOP("24H Family"),               23, 4, 16, 0x800, { 24,  0,  8, 16,  8,  0, 24, 0,  0, 24 }, RandomMemoryAccess | SelfWrite,                  3.3 },
+  { "30F",       I18N_NOOP("30F Family"),               23, 4, 16, 0xA00, { 24,  0, 24, 16, 16, 16, 24, 0,  0, 24 }, RandomMemoryAccess | SelfWrite,                  5.0 }, // dsPIC: eeprom max = 2 kwords = 4 kbytes
+  { "33F",       I18N_NOOP("33F Family"),               23, 4, 16, 0x800, { 24,  0, 16, 16, 16,  0, 24, 0,  0, 24 }, RandomMemoryAccess | SelfWrite,                  3.3 }
 };
 
 const Pic::Checksum::Algorithm::Data Pic::Checksum::Algorithm::DATA[Nb_Types] = {

Modified: trunk/piklab_kde4/src/devices/pic/base/pic.h
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic.h	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/devices/pic/base/pic.h	2012-07-13 05:55:00 UTC (rev 2930)
@@ -48,8 +48,7 @@
 END_DECLARE_ENUM(MemoryRangeType, MemoryRangeTypeData)
 
 enum ArchitectureProperty {
-  NoArchitectureProperty = 0, PackedHex = 1, RandomMemoryAccess = 2,
-  MaybeSelfWrite = 4, SelfWrite = 8, JFamily = 16, KFamily = 32
+  NoArchitectureProperty = 0, PackedHex = 1, RandomMemoryAccess = 2, MaybeSelfWrite = 4, SelfWrite = 8
 };
 Q_DECLARE_FLAGS(ArchitectureProperties, ArchitectureProperty)
 Q_DECLARE_OPERATORS_FOR_FLAGS(ArchitectureProperties)

Modified: trunk/piklab_kde4/src/libgui/text_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-07-13 05:55:00 UTC (rev 2930)
@@ -13,6 +13,8 @@
 #include <klibloader.h>
 #include <ktexteditor/markinterface.h>
 #include <ktexteditor/smartinterface.h>
+#include <ktexteditor/factory.h>
+#include <ktexteditor/editor.h>
 #include <kxmlguifactory.h>
 #include <kstandarddirs.h>
 
@@ -279,6 +281,20 @@
     markInterface->setMark(*it, KTextEditor::MarkInterface::Bookmark);
 }
 
+void TextEditor::configure()
+{
+  KPluginLoader loader("katepart");
+  KPluginFactory *factory = loader.factory();
+  KTextEditor::Factory* kteFactory = qobject_cast<KTextEditor::Factory*>(factory);
+  if (kteFactory == NULL) qFatal("Could not find katepart: Install Kate.");
+  KTextEditor::Editor* editor = kteFactory->editor();
+  if (editor != NULL
+    && editor->configDialogSupported()) {
+    editor->configDialog(&MainWindow::self());
+    editor->writeConfig();
+  }
+}
+
 #if 0
 void TextEditor::slotChangedText()
 {

Modified: trunk/piklab_kde4/src/libgui/text_editor.h
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.h	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/libgui/text_editor.h	2012-07-13 05:55:00 UTC (rev 2930)
@@ -41,6 +41,7 @@
   virtual bool eventFilter(QObject *o, QEvent *e);
   virtual QValueList<uint> bookmarkLines() const;
   virtual void setBookmarkLines(const QValueList<uint> &lines);
+  static void configure();
 
 public slots:
   void addView();

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-07-13 05:55:00 UTC (rev 2930)
@@ -353,6 +353,9 @@
     a = actionCollection()->addAction("options_configure_programmers", this, SLOT(configureProgrammers()));
     a->setText(i18n("Configure Programmers..."));
     a->setIcon(KIcon("audio-card"));
+    a = actionCollection()->addAction("options_configure_editor", this, SLOT(configureEditor()));
+    a->setText(i18n("Configure Editor..."));
+    a->setIcon(KIcon("preferences-other"));
     actionCollection()->addAction(KStandardAction::Preferences, this, SLOT(configure()));
 
     setupGUI(ToolBar|Keys|StatusBar|Create);
@@ -420,6 +423,11 @@
   Debugger::manager->update(true);
 }
 
+void MainWindow::configureEditor()
+{
+  TextEditor::configure();
+}
+
 void MainWindow::selectProgrammer(const Programmer::Group &group)
 {
   if ( group.name()==Main::programmerGroup().name() ) return;

Modified: trunk/piklab_kde4/src/libgui/toplevel.h
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.h	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/libgui/toplevel.h	2012-07-13 05:55:00 UTC (rev 2930)
@@ -80,6 +80,7 @@
 
   void configureToolchains();
   void configureProgrammers();
+  void configureEditor();
   void showProgrammerSettings() { configure(ConfigCenter::ProgOptions); }
   void showDebuggerSettings() { configure(ConfigCenter::DebugOptions); }
 

Modified: trunk/piklab_kde4/src/progs/icd2/base/icd2.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/icd2/base/icd2.cpp	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/src/progs/icd2/base/icd2.cpp	2012-07-13 05:55:00 UTC (rev 2930)
@@ -274,6 +274,13 @@
 
 bool Icd2::Hardware::setTargetPowerOn(bool on)
 {
+  if (on) {
+    const double vdd = device().architecture().data().nominalVdd;
+    if (vdd != 5.0) {
+      log(Log::LineType::Warning, i18n("Set target power disabled because device does not support 5V supply (nomial vdd is %1V).").arg(vdd));
+      return true;
+    }
+  }
   return command(QString("05") + (on ? "FF" : "00"), 0);
 }
 

Modified: trunk/piklab_kde4/test/gputils/blinker/blinker.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker/blinker.piklab	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/test/gputils/blinker/blinker.piklab	2012-07-13 05:55:00 UTC (rev 2930)
@@ -12,6 +12,9 @@
     <is_library>true</is_library>
     <output_type>executable</output_type>
     <programmer>direct</programmer>
+    <opened_files>
+      <item>blinker.asm</item>
+    </opened_files>
   </general>
   <assembler>
     <warning_level>0</warning_level>

Modified: trunk/piklab_kde4/test/jalv2/test.piklab
===================================================================
--- trunk/piklab_kde4/test/jalv2/test.piklab	2012-07-04 07:05:30 UTC (rev 2929)
+++ trunk/piklab_kde4/test/jalv2/test.piklab	2012-07-13 05:55:00 UTC (rev 2930)
@@ -7,9 +7,6 @@
     <files>
       <item>test.jal</item>
     </files>
-    <opened_files>
-      <item>test.jal</item>
-    </opened_files>
   </general>
   <editors/>
 </piklab>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2929] trunk/piklab_kde4/test

From: <az...@us...> - 2012-07-04 07:05:40

Revision: 2929
          http://piklab.svn.sourceforge.net/piklab/?rev=2929&view=rev
Author:   azhyd
Date:     2012-07-04 07:05:30 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------


Added Paths:
-----------
    trunk/piklab_kde4/test/jalv2/
    trunk/piklab_kde4/test/jalv2/test.jal
    trunk/piklab_kde4/test/jalv2/test.piklab

Added: trunk/piklab_kde4/test/jalv2/test.jal
===================================================================
--- trunk/piklab_kde4/test/jalv2/test.jal	                        (rev 0)
+++ trunk/piklab_kde4/test/jalv2/test.jal	2012-07-04 07:05:30 UTC (rev 2929)
@@ -0,0 +1,11 @@
+-- -----------------------------------------------------------------------
+-- Template source file generated by piklab
+include 16f818
+
+-- -----------------------------------------------------------------------
+-- Configuration bits: adapt to your setup and needs
+
+-- main code
+-- << insert code >>
+forever loop -- loop forever
+end loop

Added: trunk/piklab_kde4/test/jalv2/test.piklab
===================================================================
--- trunk/piklab_kde4/test/jalv2/test.piklab	                        (rev 0)
+++ trunk/piklab_kde4/test/jalv2/test.piklab	2012-07-04 07:05:30 UTC (rev 2929)
@@ -0,0 +1,15 @@
+<!DOCTYPE piklab>
+<piklab>
+  <general>
+    <device>16F818</device>
+    <tool>jalv2</tool>
+    <programmer>gpsim</programmer>
+    <files>
+      <item>test.jal</item>
+    </files>
+    <opened_files>
+      <item>test.jal</item>
+    </opened_files>
+  </general>
+  <editors/>
+</piklab>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2928] trunk/piklab_kde4

From: <az...@us...> - 2012-07-04 07:02:34

Revision: 2928
          http://piklab.svn.sourceforge.net/piklab/?rev=2928&view=rev
Author:   azhyd
Date:     2012-07-04 07:02:24 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
+ fixed so that an error is reported when executable not found
+ fixed parsing for jalv2
+ fixed jalv2 templerate generator

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/common/global/process.cpp
    trunk/piklab_kde4/src/common/global/process.h
    trunk/piklab_kde4/src/common/global/process_kde.cpp
    trunk/piklab_kde4/src/common/global/process_kde.h
    trunk/piklab_kde4/src/progs/custom/base/custom_prog.cpp
    trunk/piklab_kde4/src/tools/boost/boostc_compile.cpp
    trunk/piklab_kde4/src/tools/c18/c18_compile.cpp
    trunk/piklab_kde4/src/tools/cc5x/cc5x_compile.cpp
    trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
    trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.h
    trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
    trunk/piklab_kde4/src/tools/jalv2/CMakeLists.txt
    trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
    trunk/piklab_kde4/src/tools/jalv2/jalv2_compile.cpp
    trunk/piklab_kde4/src/tools/list/compile_process.cpp
    trunk/piklab_kde4/src/tools/list/compile_process.h
    trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
    trunk/piklab_kde4/src/tools/mpc/mpc_compile.h
    trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp

Added Paths:
-----------
    trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.cpp
    trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.h

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/Changelog	2012-07-04 07:02:24 UTC (rev 2928)
@@ -1,3 +1,8 @@
+0.16.2 (3 July 2012)
+* fixed toolchain output when executable cannot be found
+* fixed parsing for jalv2 [reported by biglacko]
+* fixed template generator for jalv2
+
 0.16.1 (1 July 2012)
 * fixed command-line utilities compilation with Qt only
 * fixed command-line utilities compilation on Windows

Modified: trunk/piklab_kde4/src/common/global/process.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/process.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/common/global/process.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -23,7 +23,8 @@
     _stopExecute(false)
 {
   _process = new ProcessIO(this);
-  connect(_process, SIGNAL(processExited()), SLOT(exitedSlot()));
+  connect(_process, SIGNAL(finished()), SLOT(finishedSlot()));
+  connect(_process, SIGNAL(error()), SLOT(errorSlot()));
   connect(_process, SIGNAL(readyReadStdout()), SLOT(readyReadStdoutSlot()));
   connect(_process, SIGNAL(readyReadStderr()), SLOT(readyReadStderrSlot()));
   connect(&_timer, SIGNAL(timeout()), SLOT(timeoutSlot()));
@@ -69,7 +70,7 @@
   }
 
   if ( !_process->start(env.isEmpty() ? 0 : &env) ) {
-    _state = StartFailed;
+    _state = Error;
     return false;
   }
 
@@ -83,14 +84,21 @@
   return _process->_kproc->exitCode();
 }
 
-void Process::Base::exitedSlot()
+void Process::Base::finishedSlot()
 {
   _timer.stop();
   _state = Exited;
   FOR_EACH(OutputType, type) readyRead(type);
-  emit done(exitCode());
+  emit done();
 }
 
+void Process::Base::errorSlot()
+{
+  _timer.stop();
+  _state = Error;
+  emit error();
+}
+
 void Process::Base::timeoutSlot()
 {
   kill();

Modified: trunk/piklab_kde4/src/common/global/process.h
===================================================================
--- trunk/piklab_kde4/src/common/global/process.h	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/common/global/process.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -27,7 +27,7 @@
 //typedef Q3Process ProcessIO;
 
 //----------------------------------------------------------------------------
-enum State { Stopped, StartFailed, Running, Exited, Timedout, Killed };
+enum State { Stopped, Error, Running, Exited, Timedout, Killed, };
 
 BEGIN_DECLARE_ENUM(OutputType)
   Stdout = 0, Stderr
@@ -55,7 +55,8 @@
   bool execute(int msec); // -1 == no timeout
 
 signals:
-  void done(int code);
+  void done();
+  void error();
   void timeout();
   void dataReceived(::Process::OutputType type);
 
@@ -63,7 +64,8 @@
   void kill();
 
 protected slots:
-  void exitedSlot();
+  void finishedSlot();
+  void errorSlot();
   void timeoutSlot();
   void readyReadStdoutSlot() { readyRead(OutputType::Stdout); }
   void readyReadStderrSlot() { readyRead(OutputType::Stderr); }

Modified: trunk/piklab_kde4/src/common/global/process_kde.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/common/global/process_kde.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -17,7 +17,8 @@
   _kproc->setOutputChannelMode(KProcess::SeparateChannels);
   connect(_kproc.get(), SIGNAL(readyReadStandardOutput()), SLOT(receivedStandardOutput()));
   connect(_kproc.get(), SIGNAL(readyReadStandardError()), SLOT(receivedStandardError()));
-  connect(_kproc.get(), SIGNAL(stateChanged(QProcess::ProcessState)), SLOT(stateChanged(QProcess::ProcessState)));
+  connect(_kproc.get(), SIGNAL(error(QProcess::ProcessError)), SIGNAL(error()));
+  connect(_kproc.get(), SIGNAL(finished(int, QProcess::ExitStatus)), SIGNAL(finished()));
 }
 
 void Process::ProcessIO::setArguments(const QStringList &args)
@@ -78,8 +79,3 @@
   for (int i=0; i<data.size(); i++) _stderr[n+i] = data[i] != '\0' ? data[i] : ' ';
   emit readyReadStderr();
 }
-
-void Process::ProcessIO::stateChanged(QProcess::ProcessState state)
-{
-  if (state == QProcess::NotRunning) emit processExited();
-}

Modified: trunk/piklab_kde4/src/common/global/process_kde.h
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.h	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/common/global/process_kde.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -28,12 +28,12 @@
 private slots:
   void receivedStandardOutput();
   void receivedStandardError();
-  void stateChanged(QProcess::ProcessState);
 
 signals:
   void readyReadStdout();
   void readyReadStderr();
-  void processExited();
+  void error();
+  void finished();
 
 private:
   std::auto_ptr<KProcess> _kproc;

Modified: trunk/piklab_kde4/src/progs/custom/base/custom_prog.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/custom/base/custom_prog.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/progs/custom/base/custom_prog.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -73,7 +73,7 @@
   }
   log(Log::LineType::Command, _process->arguments().join(" "));
   Process::State state = Process::runSynchronouslyDialog(*_process, i18n("Executing '%1' command...").arg(action));
-  if (state == Process::StartFailed) {
+  if (state == Process::Error) {
     log(Log::LineType::Error, i18n("*** Error executing command ***"));
     return false;
   }

Modified: trunk/piklab_kde4/src/tools/boost/boostc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/boost/boostc_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/boost/boostc_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -14,7 +14,7 @@
 //----------------------------------------------------------------------------
 void Boost::Process::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("(.*)\\((\\d+).*\\): (error|warning):(.*)", 1, 2, 4, 3)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("(.*)\\((\\d+).*\\): (error|warning):(.*)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0);
 }
 

Modified: trunk/piklab_kde4/src/tools/c18/c18_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/c18/c18_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/c18/c18_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -34,8 +34,8 @@
 
 void C18::CompileFile::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):([^:]+):\\s*(.+)", 1, 2, 4, 3)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):([^\\[]+)\\s*(.+)", 1, 2, 4, 3)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):([^:]+):\\s*(.+)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):([^\\[]+)\\s*(.+)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0);
 }
 

Modified: trunk/piklab_kde4/src/tools/cc5x/cc5x_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/cc5x/cc5x_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/cc5x/cc5x_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -28,7 +28,7 @@
 
 void CC5X::CompileFile::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):(.+)\\[([0-9]+)\\](.+)", 1, 2, 5, 3)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("(.*):([0-9]+):(.+)\\[([0-9]+)\\](.+)", 1, 2, 5, 3, Log::LineType::Error)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
 }
 

Modified: trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -73,12 +73,12 @@
     doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
     return;
   }
-  if ( parseErrorLine(line, Compile::ParseErrorData("[*>-]+\\s\\w+\\s\\d+\\s\"([^\"]*)\"\\sLine\\s(\\d+)\\([^)]*\\):(.*)", 1, 2, 3, type)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("[*>-]+\\s\"([^\"]*)\"\\sLine\\s(\\d+):\\s\\w+\\s#\\d+:(.*)", 1, 2, 3, type)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("[*>-]+\\s\\w+\\s\\d+\\s\"([^\"]*)\"\\sLine\\s(\\d+)\\([^)]*\\):(.*)", 1, 2, 3, -1, type)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("[*>-]+\\s\"([^\"]*)\"\\sLine\\s(\\d+):\\s\\w+\\s#\\d+:(.*)", 1, 2, 3, -1, type)) ) return;
   doLog(type, line, QString::null, 0);
 }
 
-void CCSC::CompileFile::done(int code)
+void CCSC::CompileFile::done()
 {
   // with wine, rely on error file
   if ( Compile::Config::executableType(group())==Tool::ExecutableType::Windows ) {
@@ -91,7 +91,7 @@
       for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
     }
   }
-  Compile::Process::done(code);
+  Compile::Process::done();
 }
 
 PURL::Url CCSC::CompileFile::url(PURL::FileType type, uint i) const

Modified: trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.h
===================================================================
--- trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.h	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -26,7 +26,7 @@
   virtual PURL::Url url(PURL::FileType type = PURL::Nb_FileTypes, uint i = 0) const;
 
 protected slots:
-  virtual void done(int code);
+  virtual void done();
 
 private:
   void parseLine(const QString &line);

Modified: trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -24,8 +24,8 @@
 //-----------------------------------------------------------------------------
 void GPUtils::AssembleFile::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)\\[[0-9]+\\](.+)", 1, 2, 4, 3)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, Log::LineType::Warning)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)\\[[0-9]+\\](.+)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, -1, Log::LineType::Warning)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
 }
 

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -215,10 +215,14 @@
     if ( !_group.base(k)->checkExecutable() ) _data[k].label->setText(i18n("Unknown"));
     else {
       _data[k].checkLines.clear();
-      delete _data[k].process;
+      if (_data[k].process != NULL) {
+        _data[k].process->blockSignals(true);
+        delete _data[k].process;
+      }
       _data[k].process = checkExecutableProcess(k);
       _data[k].command = _data[k].process->prettyCommand();
-      connect(_data[k].process, SIGNAL(done(int)), SLOT(checkExecutableDone()));
+      connect(_data[k].process, SIGNAL(done()), SLOT(checkExecutableDone()));
+      connect(_data[k].process, SIGNAL(error()), SLOT(checkExecutableDone()));
       connect(_data[k].process, SIGNAL(timeout()), SLOT(checkExecutableDone()));
       QString exec = baseExecutable(k);
       if ( !_data[k].process->start(5000) ) _data[k].label->setText(i18n("\"%1\" not found").arg(exec));
@@ -234,7 +238,8 @@
       delete _devicesData[i].process;
       _devicesData[i].process = checkDevicesProcess(i);
       _devicesData[i].command = _devicesData[i].process->prettyCommand();
-      connect(_devicesData[i].process, SIGNAL(done(int)), SLOT(checkDevicesDone()));
+      connect(_devicesData[i].process, SIGNAL(done()), SLOT(checkDevicesDone()));
+      connect(_devicesData[i].process, SIGNAL(error()), SLOT(checkDevicesDone()));
       connect(_devicesData[i].process, SIGNAL(timeout()), SLOT(checkDevicesDone()));
       _devicesData[i].done = false;
       _devicesData[i].checkLines.clear();

Modified: trunk/piklab_kde4/src/tools/jalv2/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/CMakeLists.txt	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/jalv2/CMakeLists.txt	2012-07-04 07:02:24 UTC (rev 2928)
@@ -6,6 +6,7 @@
    jalv2_compile.cpp
    jalv2_config.cpp
    jalv2.cpp
+   jalv2_generator.cpp
 )
 
 automoc(${jalv2_STAT_SRCS})

Modified: trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -10,11 +10,11 @@
 
 #include "jalv2_compile.h"
 #include "jalv2_config.h"
+#include "jalv2_generator.h"
 #include "devices/base/device_group.h"
 #include "devices/pic/pic/pic_memory.h"
 #include "devices/list/device_list.h"
 #include "common/global/process.h"
-#include "tools/jal/jal_generator.h"
 
 //----------------------------------------------------------------------------
 bool JALV2::Base::checkExecutableResult(Tool::ExecutableType, QStringList &lines) const
@@ -64,5 +64,5 @@
 
 Tool::SourceGenerator *JALV2::Group::sourceGeneratorFactory() const
 {
-  return new JAL::SourceGenerator;
+  return new JALV2::SourceGenerator;
 }

Modified: trunk/piklab_kde4/src/tools/jalv2/jalv2_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -33,8 +33,8 @@
 
 void JALV2::CompileFile::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(warning)(.+)", 1, 2, 4, 3)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(.+)", 1, 2, 3, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(warning)(.+)", 1, 2, 4, 3, Log::LineType::Warning)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):\\s*(.+)", 1, 2, 3, -1, Log::LineType::Error)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
 }
 

Added: trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.cpp	                        (rev 0)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -0,0 +1,34 @@
+/***************************************************************************
+ *   Copyright (C) 2012 Nicolas Hadacek <ha...@kd...>                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+#include "jalv2_generator.h"
+
+#include "devices/pic/base/pic.h"
+
+SourceLine::List JALV2::SourceGenerator::configLines(PURL::ToolType, const Device::Memory &, bool &) const
+{
+  // no config lines (?)
+  return SourceLine::List();
+}
+
+SourceLine::List JALV2::SourceGenerator::includeLines(PURL::ToolType, const Device::Data &data) const
+{
+  SourceLine::List lines;
+  lines.appendNotIndentedCode("include " + data.name().lower());
+  return lines;
+}
+
+SourceLine::List JALV2::SourceGenerator::sourceFileContent(PURL::ToolType, const Device::Data &, bool &) const
+{
+  SourceLine::List lines;
+  lines.appendTitle(i18n("main code"));
+  lines.appendNotIndentedCode(QString::null, "<< " + i18n("insert code") + " >>");
+  lines.appendNotIndentedCode("forever loop", i18n("loop forever"));
+  lines.appendNotIndentedCode("end loop");
+  return lines;
+}

Added: trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.h
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.h	                        (rev 0)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2_generator.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -0,0 +1,27 @@
+/***************************************************************************
+ *   Copyright (C) 2012 Nicolas Hadacek <ha...@kd...>                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+#ifndef JALV2_GENERATOR_H
+#define JALV2_GENERATOR_H
+
+#include "tools/base/tool_group.h"
+
+namespace JALV2
+{
+
+class SourceGenerator : public Tool::SourceGenerator
+{
+public:
+  virtual SourceLine::List configLines(PURL::ToolType type, const Device::Memory &memory, bool &ok) const;
+  virtual SourceLine::List sourceFileContent(PURL::ToolType type, const Device::Data &data, bool &ok) const;
+  virtual SourceLine::List includeLines(PURL::ToolType type, const Device::Data &data) const;
+};
+
+} // namespace
+
+#endif

Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -209,7 +209,8 @@
   _stderr = QString::null;
   delete _process;
   _process = new ::Process::LineSignal;
-  connect(_process, SIGNAL(done(int)), SLOT(done(int)));
+  connect(_process, SIGNAL(done()), SLOT(done()));
+  connect(_process, SIGNAL(error()), SLOT(error()));
   connect(_process, SIGNAL(timeout()), SLOT(timeout()));
   connect(_process, SIGNAL(logLine(::Process::OutputType, const QString &)),
           SLOT(logLine(::Process::OutputType, const QString &)));
@@ -219,15 +220,26 @@
   return _process->start();
 }
 
-void Compile::BaseProcess::done(int code)
+void Compile::BaseProcess::error()
 {
+  _manager->log(Log::LineType::Error, i18n("*** Error executing command ***"));
+  _manager->processFailed();
+}
+
+void Compile::BaseProcess::done()
+{
+  int code = _process->exitCode();
   if ( code!=0 ) {
     _manager->log(Log::LineType::Error, i18n("*** Exited with status: %1 ***").arg(code));
     _manager->processFailed();
-  } else if ( _manager->hasError() ) {
+    return;
+  }
+  if ( _manager->hasError() ) {
     _manager->log(Log::LineType::Error, i18n("*** Error ***"));
     _manager->processFailed();
-  } else _manager->processDone();
+    return;
+  }
+  _manager->processDone();
 }
 
 void Compile::BaseProcess::timeout()

Modified: trunk/piklab_kde4/src/tools/list/compile_process.h
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.h	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/list/compile_process.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -72,11 +72,7 @@
 
 class ParseErrorData {
 public:
-  ParseErrorData(const QString &p, int iFile, int iLine, int iMessage, Log::LineType dLineType)
-    : pattern(p), indexFile(iFile), indexLine(iLine), indexMessage(iMessage), indexLogType(-1),
-      defaultLineType(dLineType) {}
-  ParseErrorData(const QString &p, int iFile, int iLine, int iMessage, uint iLogType,
-                 Log::LineType dLineType = Log::LineType::Error)
+  ParseErrorData(const QString &p, int iFile, int iLine, int iMessage, uint iLogType, Log::LineType dLineType)
     : pattern(p), indexFile(iFile), indexLine(iLine), indexMessage(iMessage), indexLogType(iLogType),
       defaultLineType(dLineType) {}
   QString pattern;
@@ -189,7 +185,8 @@
 
 protected slots:
   virtual void logLine(::Process::OutputType type, const QString &line) = 0;
-  virtual void done(int code);
+  virtual void done();
+  void error();
   void timeout();
 };
 

Modified: trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -28,11 +28,11 @@
 
 void MPC::CompileFile::parseLine(const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("(\\w+)\\s+(.*)\\s+(\\d+):\\d+:(.*)", 2, 3, 4, 1)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("(\\w+)\\s+(.*)\\s+(\\d+):\\d+:(.*)", 2, 3, 4, 1, Log::LineType::Error)) ) return;
   doLog(Log::LineType::Normal, line, QString::null, 0); // unrecognized
 }
 
-void MPC::CompileFile::done(int code)
+void MPC::CompileFile::done()
 {
   // rely on error file
   PURL::Url url = PURL::Url(directory(), inputFilepath(0)).toExtension("err");
@@ -43,7 +43,7 @@
     QStringList lines = file.readLines();
     for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
   }
-  Compile::Process::done(code);
+  Compile::Process::done();
 }
 
 QString MPC::CompileFile::outputFiles() const

Modified: trunk/piklab_kde4/src/tools/mpc/mpc_compile.h
===================================================================
--- trunk/piklab_kde4/src/tools/mpc/mpc_compile.h	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/mpc/mpc_compile.h	2012-07-04 07:02:24 UTC (rev 2928)
@@ -24,7 +24,7 @@
   virtual QString outputFiles() const;
 
 protected slots:
-  virtual void done(int code);
+  virtual void done();
 
 private:
   void parseLine(const QString &line);

Modified: trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp	2012-07-02 00:58:48 UTC (rev 2927)
+++ trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp	2012-07-04 07:02:24 UTC (rev 2928)
@@ -43,13 +43,13 @@
 
 void SDCC::Process::logLine(::Process::OutputType, const QString &line)
 {
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):( syntax error):(.+)", 1, 2, 4, -1)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):( error)(.+)", 1, 2, 4, -1)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(error|warning|message):(.+)", 1, 2, 4, 3)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(\\w+)\\s*\\[[0-9]+\\](.+)", 1, 2, 4, 3)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):( syntax error):(.+)", 1, 2, 4, -1, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):( error)(.+)", 1, 2, 4, -1, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(error|warning|message):(.+)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(\\w+)\\s*\\[[0-9]+\\](.+)", 1, 2, 4, 3, Log::LineType::Error)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*)\\s*[0-9]+:(.+)", -1, -1, 2, 1, Log::LineType::Warning)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)", 1, 2, 3, Log::LineType::Warning)) ) return;
-  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, Log::LineType::Warning)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([0-9]+):(.+)", 1, 2, 3, -1, Log::LineType::Warning)) ) return;
+  if ( parseErrorLine(line, Compile::ParseErrorData("([^:]*):([^:]+):([0-9]+):(.+)", 2, 3, 4, -1, Log::LineType::Warning)) ) return;
   if ( parseErrorLine(line, Compile::ParseErrorData("([^:]+):(.+)", -1, -1, 2, 1, Log::LineType::Warning)) ) return;
   doLog(filterType(line), line, QString::null, 0);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2927] trunk/www

From: <az...@us...> - 2012-07-02 00:58:54

Revision: 2927
          http://piklab.svn.sourceforge.net/piklab/?rev=2927&view=rev
Author:   azhyd
Date:     2012-07-02 00:58:48 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/Changelog
    trunk/www/devel.php

Modified: trunk/www/Changelog
===================================================================
--- trunk/www/Changelog	2012-07-02 00:58:05 UTC (rev 2926)
+++ trunk/www/Changelog	2012-07-02 00:58:48 UTC (rev 2927)
@@ -1,6 +1,13 @@
+0.16.1 (1 July 2012)
+* fixed command-line utilities compilation with Qt only
+* fixed command-line utilities compilation on Windows
+* removed icd3 since it is far from ready
+* fixed pinout for 10F2XX devices [reported by Junya Keller]
+* added support for 33FJ32MC202/MC204/XX302/XX304 33FJ128GP802/GP804 [requested by Roland Chapuis]
+
 0.16.0 (3 June 2012)
-* port to KDE4
-* add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
+* ported to KDE4
+* added default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
 * added support for 10F320/322, 12F617/752
 * added support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]
 * added support for direct programming of 12F1822/16F182X [with help from Michael Vrolijk]

Modified: trunk/www/devel.php
===================================================================
--- trunk/www/devel.php	2012-07-02 00:58:05 UTC (rev 2926)
+++ trunk/www/devel.php	2012-07-02 00:58:48 UTC (rev 2927)
@@ -18,14 +18,14 @@
 
 <p>To download the latest development sources, use the following command:
 <code>
-  svn co https://piklab.svn.sourceforge.net/svnroot/piklab/trunk/piklab piklab
+  svn co https://piklab.svn.sourceforge.net/svnroot/piklab/trunk/piklab_kde4 piklab_kde4
 </code>
 </p>
 
 <p>To download the latest stable sources, use the following command:
 <code>
-  svn co https://piklab.svn.sourceforge.net/svnroot/piklab/branches/PIKLAB_X_Y_Z piklab-X.Y.Z
-</code> where X.Y.Z is the version.
+  svn co https://piklab.svn.sourceforge.net/svnroot/piklab/tags/PIKLAB_x_y_z_RELEASE piklab-x.y.z
+</code> where z.y.z is the version.
 </p>
 
 <h1>Authors:</h1>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2926] tags/PIKLAB_0_16_1_RELEASE/

From: <az...@us...> - 2012-07-02 00:58:11

Revision: 2926
          http://piklab.svn.sourceforge.net/piklab/?rev=2926&view=rev
Author:   azhyd
Date:     2012-07-02 00:58:05 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
release 0.16.1

Added Paths:
-----------
    tags/PIKLAB_0_16_1_RELEASE/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2925] trunk/www/devices

From: <az...@us...> - 2012-07-02 00:53:27

Revision: 2925
          http://piklab.svn.sourceforge.net/piklab/?rev=2925&view=rev
Author:   azhyd
Date:     2012-07-02 00:53:14 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
update device pages

Modified Paths:
--------------
    trunk/www/devices/18F25J10.htm
    trunk/www/devices/18F44J10.htm
    trunk/www/devices/18F45J10.htm
    trunk/www/devices/18F63J11.htm
    trunk/www/devices/18F63J90.htm
    trunk/www/devices/18F64J11.htm
    trunk/www/devices/18F64J90.htm
    trunk/www/devices/18F65J10.htm
    trunk/www/devices/18F65J11.htm
    trunk/www/devices/18F65J15.htm
    trunk/www/devices/18F65J50.htm
    trunk/www/devices/18F65J90.htm
    trunk/www/devices/18F66J10.htm
    trunk/www/devices/18F66J11.htm
    trunk/www/devices/18F66J15.htm
    trunk/www/devices/18F66J16.htm
    trunk/www/devices/18F66J50.htm
    trunk/www/devices/18F66J55.htm
    trunk/www/devices/18F66J65.htm
    trunk/www/devices/18F67J10.htm
    trunk/www/devices/18F67J11.htm
    trunk/www/devices/18F67J50.htm
    trunk/www/devices/18F67J60.htm
    trunk/www/devices/18F83J11.htm
    trunk/www/devices/18F83J90.htm
    trunk/www/devices/18F84J11.htm
    trunk/www/devices/18F84J90.htm
    trunk/www/devices/18F85J10.htm
    trunk/www/devices/18F85J11.htm
    trunk/www/devices/18F85J15.htm
    trunk/www/devices/18F85J50.htm
    trunk/www/devices/18F85J90.htm
    trunk/www/devices/18F86J10.htm
    trunk/www/devices/18F86J11.htm
    trunk/www/devices/18F86J15.htm
    trunk/www/devices/18F86J16.htm
    trunk/www/devices/18F86J50.htm
    trunk/www/devices/18F86J55.htm
    trunk/www/devices/18F86J60.htm
    trunk/www/devices/18F86J65.htm
    trunk/www/devices/18F87J10.htm
    trunk/www/devices/18F87J11.htm
    trunk/www/devices/18F87J50.htm
    trunk/www/devices/18F96J60.htm
    trunk/www/devices/18F96J65.htm
    trunk/www/devices/24FJ128GA006.htm
    trunk/www/devices/24FJ128GA008.htm
    trunk/www/devices/24FJ64GA002.htm
    trunk/www/devices/24FJ64GA004.htm
    trunk/www/devices/24FJ64GA006.htm
    trunk/www/devices/24FJ64GA008.htm
    trunk/www/devices/24FJ64GA010.htm
    trunk/www/devices/24FJ96GA006.htm
    trunk/www/devices/24FJ96GA008.htm
    trunk/www/devices/24FJ96GA010.htm
    trunk/www/devices/24HJ128GP206.htm
    trunk/www/devices/24HJ128GP210.htm
    trunk/www/devices/24HJ128GP306.htm
    trunk/www/devices/24HJ128GP310.htm
    trunk/www/devices/24HJ128GP506.htm
    trunk/www/devices/24HJ128GP510.htm
    trunk/www/devices/24HJ12GP201.htm
    trunk/www/devices/24HJ12GP202.htm
    trunk/www/devices/24HJ16GP304.htm
    trunk/www/devices/24HJ256GP206.htm
    trunk/www/devices/24HJ256GP210.htm
    trunk/www/devices/24HJ256GP610.htm
    trunk/www/devices/24HJ32GP202.htm
    trunk/www/devices/24HJ32GP204.htm
    trunk/www/devices/24HJ64GP206.htm
    trunk/www/devices/24HJ64GP210.htm
    trunk/www/devices/24HJ64GP506.htm
    trunk/www/devices/24HJ64GP510.htm
    trunk/www/devices/30F1010.htm
    trunk/www/devices/30F2010.htm
    trunk/www/devices/30F2011.htm
    trunk/www/devices/30F2012.htm
    trunk/www/devices/30F2020.htm
    trunk/www/devices/30F2023.htm
    trunk/www/devices/30F3010.htm
    trunk/www/devices/30F3011.htm
    trunk/www/devices/30F3012.htm
    trunk/www/devices/30F3013.htm
    trunk/www/devices/30F3014.htm
    trunk/www/devices/30F4011.htm
    trunk/www/devices/30F4012.htm
    trunk/www/devices/30F4013.htm
    trunk/www/devices/30F5011.htm
    trunk/www/devices/30F5013.htm
    trunk/www/devices/30F5015.htm
    trunk/www/devices/30F5016.htm
    trunk/www/devices/30F6010.htm
    trunk/www/devices/30F6010A.htm
    trunk/www/devices/30F6011.htm
    trunk/www/devices/30F6011A.htm
    trunk/www/devices/30F6012.htm
    trunk/www/devices/30F6012A.htm
    trunk/www/devices/30F6013.htm
    trunk/www/devices/30F6013A.htm
    trunk/www/devices/30F6014.htm
    trunk/www/devices/30F6014A.htm
    trunk/www/devices/30F6015.htm
    trunk/www/devices/33FJ12GP201.htm
    trunk/www/devices/33FJ12GP202.htm
    trunk/www/devices/33FJ16GP304.htm
    trunk/www/devices/33FJ16GS402.htm
    trunk/www/devices/33FJ16GS404.htm
    trunk/www/devices/33FJ16GS502.htm
    trunk/www/devices/33FJ16GS504.htm
    trunk/www/devices/33FJ32GP202.htm
    trunk/www/devices/33FJ32GP204.htm
    trunk/www/devices/devices.php

Added Paths:
-----------
    trunk/www/devices/33FJ128GP802.htm
    trunk/www/devices/33FJ128GP802_33FJ128GP802_extended.png
    trunk/www/devices/33FJ128GP802_33FJ128GP802_industrial.png
    trunk/www/devices/33FJ128GP802_pins_graph.png
    trunk/www/devices/33FJ128GP804.htm
    trunk/www/devices/33FJ128GP804_33FJ128GP804_extended.png
    trunk/www/devices/33FJ128GP804_33FJ128GP804_industrial.png
    trunk/www/devices/33FJ32GP302.htm
    trunk/www/devices/33FJ32GP302_33FJ32GP302_extended.png
    trunk/www/devices/33FJ32GP302_33FJ32GP302_industrial.png
    trunk/www/devices/33FJ32GP302_pins_graph.png
    trunk/www/devices/33FJ32GP304.htm
    trunk/www/devices/33FJ32GP304_33FJ32GP304_extended.png
    trunk/www/devices/33FJ32GP304_33FJ32GP304_industrial.png
    trunk/www/devices/33FJ32GP304_pins_graph.png
    trunk/www/devices/33FJ32MC202.htm
    trunk/www/devices/33FJ32MC202_33FJ32MC202_extended.png
    trunk/www/devices/33FJ32MC202_33FJ32MC202_industrial.png
    trunk/www/devices/33FJ32MC202_pins_graph.png
    trunk/www/devices/33FJ32MC204.htm
    trunk/www/devices/33FJ32MC204_33FJ32MC204_extended.png
    trunk/www/devices/33FJ32MC204_33FJ32MC204_industrial.png
    trunk/www/devices/33FJ32MC302.htm
    trunk/www/devices/33FJ32MC302_33FJ32MC302_extended.png
    trunk/www/devices/33FJ32MC302_33FJ32MC302_industrial.png
    trunk/www/devices/33FJ32MC302_pins_graph.png
    trunk/www/devices/33FJ32MC304.htm
    trunk/www/devices/33FJ32MC304_33FJ32MC304_extended.png
    trunk/www/devices/33FJ32MC304_33FJ32MC304_industrial.png
    trunk/www/devices/33FJ32MC304_pins_graph.png

Modified: trunk/www/devices/18F25J10.htm
===================================================================
--- trunk/www/devices/18F25J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F25J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F25J10 / 18LF25J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en024622">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] PORTC[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>PDIP[28] SOIC[28] SSOP[28] QFN[28] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F25J10 - Temperature range: Industrial</h3><img src="devices/18F25J10_18F25J10_industrial.png" /><h3>18LF25J10 - Temperature range: Industrial</h3><img src="devices/18F25J10_18LF25J10_industrial.png" /></td><td valign="top"><table cellpadding="3"><tr bgcolor="gray"><th align="center">PDIP(28) SOIC(28) SSOP(28)</th></tr><tr><td align="center"><img src="devices/18F25J10_pins_graph.png" /></td></tr></table></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F44J10.htm
===================================================================
--- trunk/www/devices/18F44J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F44J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F44J10 / 18LF44J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en024620">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>8,188 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] PORTC[8] PORTD[8] PORTE[3] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>PDIP[40] QFN[44] TQFP[44] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F44J10 - Temperature range: Industrial</h3><img src="devices/18F44J10_18F44J10_industrial.png" /><h3>18LF44J10 - Temperature range: Industrial</h3><img src="devices/18F44J10_18LF44J10_industrial.png" /></td><td valign="top"><table cellpadding="3"><tr bgcolor="gray"><th align="center">PDIP(40)</th></tr><tr><td align="center"><img src="devices/18F44J10_pins_graph.png" /></td></tr></table></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F45J10.htm
===================================================================
--- trunk/www/devices/18F45J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F45J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F45J10 / 18LF45J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en024619">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] PORTC[8] PORTD[8] PORTE[3] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>PDIP[40] QFN[44] TQFP[44] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F45J10 - Temperature range: Industrial</h3><img src="devices/18F45J10_18F45J10_industrial.png" /><h3>18LF45J10 - Temperature range: Industrial</h3><img src="devices/18F45J10_18LF45J10_industrial.png" /></td><td valign="top"><table cellpadding="3"><tr bgcolor="gray"><th align="center">PDIP(40)</th></tr><tr><td align="center"><img src="devices/18F45J10_pins_graph.png" /></td></tr></table></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F63J11.htm
===================================================================
--- trunk/www/devices/18F63J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F63J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F63J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026365">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>4,092 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F63J11 - Temperature range: Industrial</h3><img src="devices/18F63J11_18F63J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F63J90.htm
===================================================================
--- trunk/www/devices/18F63J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F63J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F63J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026347">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>4,092 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F63J90 - Temperature range: Industrial</h3><img src="devices/18F63J90_18F63J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F64J11.htm
===================================================================
--- trunk/www/devices/18F64J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F64J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F64J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026364">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>8,188 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F64J11 - Temperature range: Industrial</h3><img src="devices/18F64J11_18F64J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F64J90.htm
===================================================================
--- trunk/www/devices/18F64J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F64J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F64J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026346">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>8,188 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F64J90 - Temperature range: Industrial</h3><img src="devices/18F64J90_18F64J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F65J10.htm
===================================================================
--- trunk/www/devices/18F65J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F65J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F65J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022354">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F65J10 - Temperature range: Industrial</h3><img src="devices/18F65J10_18F65J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F65J11.htm
===================================================================
--- trunk/www/devices/18F65J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F65J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F65J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026363">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F65J11 - Temperature range: Industrial</h3><img src="devices/18F65J11_18F65J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F65J15.htm
===================================================================
--- trunk/www/devices/18F65J15.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F65J15.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F65J15</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022355">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>24,572 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F65J15 - Temperature range: Industrial</h3><img src="devices/18F65J15_18F65J15_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F65J50.htm
===================================================================
--- trunk/www/devices/18F65J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F65J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F65J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027180">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F65J50 - Temperature range: Industrial</h3><img src="devices/18F65J50_18F65J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F65J90.htm
===================================================================
--- trunk/www/devices/18F65J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F65J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F65J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026345">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F65J90 - Temperature range: Industrial</h3><img src="devices/18F65J90_18F65J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J10.htm
===================================================================
--- trunk/www/devices/18F66J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022356">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J10 - Temperature range: Industrial</h3><img src="devices/18F66J10_18F66J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J11.htm
===================================================================
--- trunk/www/devices/18F66J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027154">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J11 - Temperature range: Industrial</h3><img src="devices/18F66J11_18F66J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J15.htm
===================================================================
--- trunk/www/devices/18F66J15.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J15.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J15</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020090">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J15 - Temperature range: Industrial</h3><img src="devices/18F66J15_18F66J15_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J16.htm
===================================================================
--- trunk/www/devices/18F66J16.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J16.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J16</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027153">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J16 - Temperature range: Industrial</h3><img src="devices/18F66J16_18F66J16_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J50.htm
===================================================================
--- trunk/www/devices/18F66J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027179">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J50 - Temperature range: Industrial</h3><img src="devices/18F66J50_18F66J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J55.htm
===================================================================
--- trunk/www/devices/18F66J55.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J55.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J55</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027178">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J55 - Temperature range: Industrial</h3><img src="devices/18F66J55_18F66J55_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F66J65.htm
===================================================================
--- trunk/www/devices/18F66J65.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F66J65.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F66J65 / 18LF66J65</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026446">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[3] PORTE[6] PORTF[7] PORTG[1] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F66J65 - Temperature range: Industrial</h3><img src="devices/18F66J65_18F66J65_industrial.png" /><h3>18LF66J65 - Temperature range: Industrial</h3><img src="devices/18F66J65_18LF66J65_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F67J10.htm
===================================================================
--- trunk/www/devices/18F67J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F67J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F67J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020089">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F67J10 - Temperature range: Industrial</h3><img src="devices/18F67J10_18F67J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F67J11.htm
===================================================================
--- trunk/www/devices/18F67J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F67J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F67J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027152">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F67J11 - Temperature range: Industrial</h3><img src="devices/18F67J11_18F67J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F67J50.htm
===================================================================
--- trunk/www/devices/18F67J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F67J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F67J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027177">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F67J50 - Temperature range: Industrial</h3><img src="devices/18F67J50_18F67J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F67J60.htm
===================================================================
--- trunk/www/devices/18F67J60.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F67J60.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F67J60 / 18LF67J60</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026445">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[3] PORTE[6] PORTF[7] PORTG[1] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F67J60 - Temperature range: Industrial</h3><img src="devices/18F67J60_18F67J60_industrial.png" /><h3>18LF67J60 - Temperature range: Industrial</h3><img src="devices/18F67J60_18LF67J60_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F83J11.htm
===================================================================
--- trunk/www/devices/18F83J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F83J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F83J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026362">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>4,092 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F83J11 - Temperature range: Industrial</h3><img src="devices/18F83J11_18F83J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F83J90.htm
===================================================================
--- trunk/www/devices/18F83J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F83J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F83J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026344">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>4,092 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F83J90 - Temperature range: Industrial</h3><img src="devices/18F83J90_18F83J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F84J11.htm
===================================================================
--- trunk/www/devices/18F84J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F84J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F84J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026361">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>8,188 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F84J11 - Temperature range: Industrial</h3><img src="devices/18F84J11_18F84J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F84J90.htm
===================================================================
--- trunk/www/devices/18F84J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F84J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F84J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026343">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>8,188 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F84J90 - Temperature range: Industrial</h3><img src="devices/18F84J90_18F84J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F85J10.htm
===================================================================
--- trunk/www/devices/18F85J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F85J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F85J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022353">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F85J10 - Temperature range: Industrial</h3><img src="devices/18F85J10_18F85J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F85J11.htm
===================================================================
--- trunk/www/devices/18F85J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F85J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F85J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026360">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F85J11 - Temperature range: Industrial</h3><img src="devices/18F85J11_18F85J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F85J15.htm
===================================================================
--- trunk/www/devices/18F85J15.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F85J15.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F85J15</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022352">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>24,572 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F85J15 - Temperature range: Industrial</h3><img src="devices/18F85J15_18F85J15_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F85J50.htm
===================================================================
--- trunk/www/devices/18F85J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F85J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F85J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027176">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F85J50 - Temperature range: Industrial</h3><img src="devices/18F85J50_18F85J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F85J90.htm
===================================================================
--- trunk/www/devices/18F85J90.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F85J90.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F85J90</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026342">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>16,380 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[7] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, LCD, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F85J90 - Temperature range: Industrial</h3><img src="devices/18F85J90_18F85J90_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J10.htm
===================================================================
--- trunk/www/devices/18F86J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en022351">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J10 - Temperature range: Industrial</h3><img src="devices/18F86J10_18F86J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J11.htm
===================================================================
--- trunk/www/devices/18F86J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027151">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J11 - Temperature range: Industrial</h3><img src="devices/18F86J11_18F86J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J15.htm
===================================================================
--- trunk/www/devices/18F86J15.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J15.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J15</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020088">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J15 - Temperature range: Industrial</h3><img src="devices/18F86J15_18F86J15_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J16.htm
===================================================================
--- trunk/www/devices/18F86J16.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J16.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J16</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027150">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J16 - Temperature range: Industrial</h3><img src="devices/18F86J16_18F86J16_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J50.htm
===================================================================
--- trunk/www/devices/18F86J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027175">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J50 - Temperature range: Industrial</h3><img src="devices/18F86J50_18F86J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J55.htm
===================================================================
--- trunk/www/devices/18F86J55.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J55.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J55</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027181">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J55 - Temperature range: Industrial</h3><img src="devices/18F86J55_18F86J55_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J60.htm
===================================================================
--- trunk/www/devices/18F86J60.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J60.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J60 / 18LF86J60</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026444">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>32,764 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[3] PORTE[8] PORTF[7] PORTG[5] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J60 - Temperature range: Industrial</h3><img src="devices/18F86J60_18F86J60_industrial.png" /><h3>18LF86J60 - Temperature range: Industrial</h3><img src="devices/18F86J60_18LF86J60_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F86J65.htm
===================================================================
--- trunk/www/devices/18F86J65.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F86J65.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F86J65 / 18LF86J65</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en026443">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>49,148 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[3] PORTE[8] PORTF[7] PORTG[5] PORTH[8] </td></tr><tr><td>Features:</td><td>CCP, ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[64] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F86J65 - Temperature range: Industrial</h3><img src="devices/18F86J65_18F86J65_industrial.png" /><h3>18LF86J65 - Temperature range: Industrial</h3><img src="devices/18F86J65_18LF86J65_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F87J10.htm
===================================================================
--- trunk/www/devices/18F87J10.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F87J10.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F87J10</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020071">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[6] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F87J10 - Temperature range: Industrial</h3><img src="devices/18F87J10_18F87J10_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F87J11.htm
===================================================================
--- trunk/www/devices/18F87J11.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F87J11.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F87J11</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027149">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[7] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F87J11 - Temperature range: Industrial</h3><img src="devices/18F87J11_18F87J11_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F87J50.htm
===================================================================
--- trunk/www/devices/18F87J50.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F87J50.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F87J50</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027172">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>65,532 words (16 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[8] PORTB[8] PORTC[8] PORTD[8] PORTE[8] PORTF[6] PORTG[8] PORTH[8] </td></tr><tr><td>Features:</td><td>ADC, USB, USART, Self-Write</td></tr><tr><td>Packaging:</td><td>TQFP[80] </td></tr></table><hr />
 <table>
-<tr><td>Programmers:</td><td>Custom Programmer</td></tr>
+<tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer</td></tr>
 </table>
 <hr />
 <h3>18F87J50 - Temperature range: Industrial</h3><img src="devices/18F87J50_18F87J50_industrial.png" /></td><td valign="top"></td></tr></table
\ No newline at end of file

Modified: trunk/www/devices/18F96J60.htm
===================================================================
--- trunk/www/devices/18F96J60.htm	2012-07-02 00:36:36 UTC (rev 2924)
+++ trunk/www/devices/18F96J60.htm	2012-07-02 00:53:14 UTC (rev 2925)
@@ -1,6 +1,6 @@
 <table><tr><td><h1>18F96J60 / 18LF96J60</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=133...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2924] trunk/piklab_kde4

From: <az...@us...> - 2012-07-02 00:36:42

Revision: 2924
          http://piklab.svn.sourceforge.net/piklab/?rev=2924&view=rev
Author:   azhyd
Date:     2012-07-02 00:36:36 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
fix compilation warning

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-07-02 00:34:22 UTC (rev 2923)
+++ trunk/piklab_kde4/Changelog	2012-07-02 00:36:36 UTC (rev 2924)
@@ -1,12 +1,13 @@
-0.16.1 (24 June 2012)
-* fix command-line utilities compilation with Qt only
-* fix command-line utilities compilation on Windows
-* remove icd3 since it is far from ready
-* fix pinout for 10F2XX devices [reported by Junya Keller]
+0.16.1 (1 July 2012)
+* fixed command-line utilities compilation with Qt only
+* fixed command-line utilities compilation on Windows
+* removed icd3 since it is far from ready
+* fixed pinout for 10F2XX devices [reported by Junya Keller]
+* added support for 33FJ32MC202/MC204/XX302/XX304 33FJ128GP802/GP804 [requested by Roland Chapuis]
 
 0.16.0 (3 June 2012)
-* port to KDE4
-* add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
+* ported to KDE4
+* added default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
 * added support for 10F320/322, 12F617/752
 * added support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]
 * added support for direct programming of 12F1822/16F182X [with help from Michael Vrolijk]

Modified: trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp	2012-07-02 00:34:22 UTC (rev 2923)
+++ trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp	2012-07-02 00:36:36 UTC (rev 2924)
@@ -894,7 +894,7 @@
         return trailingSlash(trailing, urlWithoutHost.toLocalFile());
     }
 #ifdef __GNUC__
-#warning FIXME: Remove #ifdef below once upstream bug, QTBUG-20322, is fixed. Also see BR# 194746.
+//#warning FIXME: Remove #ifdef below once upstream bug, QTBUG-20322, is fixed. Also see BR# 194746.
 #endif
 #ifndef Q_WS_WIN
     if (isLocalFile()) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2923] trunk/piklab_kde4/CMakeLists.txt

From: <az...@us...> - 2012-07-02 00:34:28

Revision: 2923
          http://piklab.svn.sourceforge.net/piklab/?rev=2923&view=rev
Author:   azhyd
Date:     2012-07-02 00:34:22 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
prepare release

Modified Paths:
--------------
    trunk/piklab_kde4/CMakeLists.txt

Modified: trunk/piklab_kde4/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/CMakeLists.txt	2012-07-02 00:18:46 UTC (rev 2922)
+++ trunk/piklab_kde4/CMakeLists.txt	2012-07-02 00:34:22 UTC (rev 2923)
@@ -1,5 +1,5 @@
 project(piklab)
-set(VERSION "0.16.0")
+set(VERSION "0.16.1")
 
 
 if(WIN32)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2922] trunk

From: <az...@us...> - 2012-07-02 00:18:52

Revision: 2922
          http://piklab.svn.sourceforge.net/piklab/?rev=2922&view=rev
Author:   azhyd
Date:     2012-07-02 00:18:46 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------


Added Paths:
-----------
    trunk/piklab_kde3/

Removed Paths:
-------------
    trunk/piklab/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2921] trunk/piklab_kde4/po

From: <az...@us...> - 2012-07-02 00:16:59

Revision: 2921
          http://piklab.svn.sourceforge.net/piklab/?rev=2921&view=rev
Author:   azhyd
Date:     2012-07-02 00:16:48 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/piklab_kde4/po/cs.po
    trunk/piklab_kde4/po/de.po
    trunk/piklab_kde4/po/es.po
    trunk/piklab_kde4/po/fr.po
    trunk/piklab_kde4/po/hu.po
    trunk/piklab_kde4/po/it.po
    trunk/piklab_kde4/po/piklab.pot

Modified: trunk/piklab_kde4/po/cs.po
===================================================================
--- trunk/piklab_kde4/po/cs.po	2012-07-02 00:14:42 UTC (rev 2920)
+++ trunk/piklab_kde4/po/cs.po	2012-07-02 00:16:48 UTC (rev 2921)
@@ -9,7 +9,7 @@
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2012-06-03 14:24-0700\n"
+"POT-Creation-Date: 2012-07-01 17:15-0700\n"
 "PO-Revision-Date: 2007-06-18 10:07+0200\n"
 "Last-Translator: Milan Horák\n"
 "Language-Team: Czech <cs...@li...>\n"
@@ -1146,6 +1146,18 @@
 msgid "File not opened."
 msgstr "Soubor neotevřen."
 
+#: common/global/pfile.cpp:130 common/kde/kde_pfile.cpp:25
+msgid "Could not create temporary file."
+msgstr "Nemohu vytvořit dočasný soubor."
+
+#: common/global/pfile.cpp:131 common/kde/kde_pfile.cpp:26
+#: common/kde/kde_pfile.cpp:65 common/nokde/nokde_pfile.cpp:20
+#: common/nokde/nokde_pfile.cpp:38 libgui/project_manager.cpp:293
+#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
+#: tools/list/compile_manager.cpp:74
+msgid "File: %1"
+msgstr "Soubor: %1"
+
 #: common/global/xml_data_file.cpp:40
 #, fuzzy
 msgid "Error opening file: %1"
@@ -1205,20 +1217,6 @@
 msgid "Select File"
 msgstr "Vybrat soubor"
 
-#: common/kde/kde_pfile.cpp:25 common/kde/kde_pfile.cpp:105
-#: common/nokde/nokde_pfile.cpp:79
-msgid "Could not create temporary file."
-msgstr "Nemohu vytvořit dočasný soubor."
-
-#: common/kde/kde_pfile.cpp:26 common/kde/kde_pfile.cpp:65
-#: common/kde/kde_pfile.cpp:106 common/nokde/nokde_pfile.cpp:20
-#: common/nokde/nokde_pfile.cpp:38 common/nokde/nokde_pfile.cpp:66
-#: common/nokde/nokde_pfile.cpp:80 libgui/project_manager.cpp:293
-#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
-#: tools/list/compile_manager.cpp:74
-msgid "File: %1"
-msgstr "Soubor: %1"
-
 #: common/kde/kde_pfile.cpp:47
 msgid "Could not save file."
 msgstr "Nemohu uložit soubor."
@@ -1308,11 +1306,7 @@
 msgid "Settings..."
 msgstr "Rozpoznávám..."
 
-#: common/nokde/nokde_kaboutdata.cpp:380
-msgid "replace this with information about your translation team"
-msgstr "nahradit za informace o vašem překladatelském týmu"
-
-#: common/nokde/nokde_kaboutdata.cpp:436
+#: common/nokde/nokde_kaboutdata.cpp:274
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -1322,105 +1316,366 @@
 "Prosím prohlédněte si dokumentaci nebo zdrojové texty,\n"
 "chcete-li se dozvědět o licenčních podmínkách.\n"
 
-#: common/nokde/nokde_kaboutdata.cpp:443
+#: common/nokde/nokde_kaboutdata.cpp:280
 msgid "This program is distributed under the terms of the %1."
 msgstr "Tento program je distribuován za podmínek %1."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:528
-#: common/nokde/nokde_kcmdlineargs.cpp:544
+#: common/nokde/nokde_kaboutdata.cpp:305
+msgctxt "@item license (short name)"
+msgid "GPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:306
+msgctxt "@item license"
+msgid "GNU General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:309
+msgctxt "@item license (short name)"
+msgid "LGPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:310
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:313
+msgctxt "@item license (short name)"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:314
+msgctxt "@item license"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:317
+msgctxt "@item license (short name)"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:318
+msgctxt "@item license"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:321
+msgctxt "@item license (short name)"
+msgid "QPL v1.0"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:322
+msgctxt "@item license"
+msgid "Q Public License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:325
+msgctxt "@item license (short name)"
+msgid "GPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:326
+msgctxt "@item license"
+msgid "GNU General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:329
+msgctxt "@item license (short name)"
+msgid "LGPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:330
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:334
+#, fuzzy
+msgctxt "@item license"
+msgid "Custom"
+msgstr "Vlastní"
+
+#: common/nokde/nokde_kaboutdata.cpp:337
+#, fuzzy
+msgctxt "@item license"
+msgid "Not specified"
+msgstr "Nespecifikován žádný příkaz"
+
+#: common/nokde/nokde_kaboutdata.cpp:878
+msgctxt "replace this with information about your translation team"
+msgid ""
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a href=\"http://l10n.kde.org\">http://l10n.kde."
+"org</a></p>"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:273
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:275
+msgid "Use the QWS display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:278
+msgid "Restore the application for the given 'sessionId'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:279
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:280
+msgid ""
+"Limits the number of colors allocated in the color\n"
+"cube on an 8-bit display, if the application is\n"
+"using the QApplication::ManyColor color\n"
+"specification"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:281
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:282
+msgid ""
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:283
+#, fuzzy
+msgid "switches to synchronous mode for debugging"
+msgstr "Zakazuji watchdog timer pro ladění"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:285
+#, fuzzy
+msgid "defines the application font"
+msgstr "Pomozte vylepšit aplikaci"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:287
+msgid ""
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:289
+msgid "sets the default foreground color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:291
+msgid "sets the default button color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:292
+#, fuzzy
+msgid "sets the application name"
+msgstr "Pomozte vylepšit aplikaci"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:293
+msgid "sets the application title (caption)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:294
+msgid "load the testability framework"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:296
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:297
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:298
+msgid "set XIM server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:299
+#, fuzzy
+msgid "disable XIM"
+msgstr "Zakázán"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:302
+msgid "forces the application to run as QWS Server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:304
+msgid "mirrors the whole layout of widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:305
+msgid "applies the Qt stylesheet to the application widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:306
+msgid ""
+"use a different graphics system instead of the default one, options are "
+"raster and opengl (experimental)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:308
+msgid "Use 'caption' as name in the titlebar"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:309
+msgid "Use 'icon' as the application icon"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:310
+#, fuzzy
+msgid "Use alternative configuration file"
+msgstr "Používám port z konfiguračního souboru."
+
+#: common/nokde/nokde_kcmdlineargs.cpp:311
+msgid "Disable crash handler, to get core dumps"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:313
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:315
+msgid "sets the application GUI style"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:316
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format (usually WidthxHeight+XPos+YPos)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:434
+msgid "KDE Application"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:493
+msgid "Qt"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:496
+msgid "KDE"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:799
+#: common/nokde/nokde_kcmdlineargs.cpp:815
 msgid "Unknown option '%1'."
 msgstr "Neznámý přepínač '%1'."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:552
+#: common/nokde/nokde_kcmdlineargs.cpp:823
+#, fuzzy
+msgctxt "@info:shell %1 is cmdoption name"
 msgid "'%1' missing."
 msgstr "'%1' chybí."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:651
-msgid "the 2nd argument is a list of name+address, one on each line"
-msgstr "druhý parametr je seznam jméno+adresa, po jednom na každý řádek"
+#: common/nokde/nokde_kcmdlineargs.cpp:889
+msgctxt ""
+"@info:shell message on appcmd --version; do not translate 'Development "
+"Platform'%3 application name, other %n version strings"
+msgid ""
+"Qt: %1\n"
+"KDE Development Platform: %2\n"
+"%3: %4\n"
+msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
-msgid "%1 was written by somebody who wants to remain anonymous."
+#: common/nokde/nokde_kcmdlineargs.cpp:914
+msgctxt "the 2nd argument is a list of name+address, one on each line"
+msgid ""
+"%1 was written by\n"
+"%2"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:917
+#, fuzzy
+msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "%1 byl napsán někým, kdo chce zůstat neznámý."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:659
-msgid ""
-"Please use http://bugs.kde.org to report bugs, do not mail the authors "
-"directly.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:924
+#, fuzzy
+msgid "Please use http://bugs.kde.org to report bugs.\n"
 msgstr ""
 "Použijte prosím http://bugs.kde.org k nahlášení chyby, nepište přímo "
 "autorům.\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:661
-msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
-msgstr "Použijte prosím %1 k nahlášení chyby, nepište přímo autorům.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:926
+msgid "Please report bugs to %1.\n"
+msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:681
+#: common/nokde/nokde_kcmdlineargs.cpp:963
 msgid "Unexpected argument '%1'."
 msgstr "Neočekávaný parametr '%1'."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:790
+#: common/nokde/nokde_kcmdlineargs.cpp:1087
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 "K získání seznamu dostupných voleb příkazové řádky použijte přepínač --help."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:809
-msgid ""
-"\n"
-"%1:\n"
-msgstr ""
-"\n"
-"%1:\n"
-
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_kcmdlineargs.cpp:1110
 msgid "[options] "
 msgstr "[přepínače]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:825
+#: common/nokde/nokde_kcmdlineargs.cpp:1117
 msgid "[%1-options]"
 msgstr "[%1-přepínače]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:845
+#: common/nokde/nokde_kcmdlineargs.cpp:1138
 msgid "Usage: %1 %2\n"
 msgstr "Použití: %1 %2\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:848
-msgid "Generic options"
+#: common/nokde/nokde_kcmdlineargs.cpp:1141
+#, fuzzy
+msgid ""
+"\n"
+"Generic options:\n"
 msgstr "Obecné přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:849
+#: common/nokde/nokde_kcmdlineargs.cpp:1143
 msgid "Show help about options"
 msgstr "Zobrazit nápovědu k přepínačům"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_kcmdlineargs.cpp:1151
 msgid "Show %1 specific options"
 msgstr "Zobrazit přepínače pro %1"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:864
+#: common/nokde/nokde_kcmdlineargs.cpp:1158
 msgid "Show all options"
 msgstr "Zobrazit všechny přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:865
+#: common/nokde/nokde_kcmdlineargs.cpp:1159
 msgid "Show author information"
 msgstr "Zobrazit informaci o autorech"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:866
+#: common/nokde/nokde_kcmdlineargs.cpp:1160
 msgid "Show version information"
 msgstr "Zobrazit informaci o verzi"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:867
+#: common/nokde/nokde_kcmdlineargs.cpp:1161
 msgid "Show license information"
 msgstr "Zobrazit informaci o licenci"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:868
+#: common/nokde/nokde_kcmdlineargs.cpp:1162
 msgid "End of options"
 msgstr "Konec přepínačů"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:890
-msgid "%1 options"
+#: common/nokde/nokde_kcmdlineargs.cpp:1183
+#, fuzzy
+msgid ""
+"\n"
+"%1 options:\n"
 msgstr "%1 přepínače"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:892
+#: common/nokde/nokde_kcmdlineargs.cpp:1185
 msgid ""
 "\n"
 "Options:\n"
@@ -1428,7 +1683,7 @@
 "\n"
 "Přepínače:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:953
+#: common/nokde/nokde_kcmdlineargs.cpp:1243
 msgid ""
 "\n"
 "Arguments:\n"
@@ -1436,18 +1691,18 @@
 "\n"
 "Parametry:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1320
+#: common/nokde/nokde_kcmdlineargs.cpp:1597
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr "Soubory/adresy otevřené aplikací budou po použití smazány"
 
+#: common/nokde/nokde_kcmdlineargs.cpp:1598
+msgid "KDE-tempfile"
+msgstr ""
+
 #: common/nokde/nokde_pfile.cpp:19
 msgid "Could not open file for writing."
 msgstr "Nemohu otevřít soubor pro zápis."
 
-#: common/nokde/nokde_pfile.cpp:65
-msgid "Could not write to temporary file."
-msgstr "Nemohu zapisovat do dočasného souboru."
-
 #: common/nokde/nokde_purl.cpp:15
 #, fuzzy
 msgid "Could not copy non-local file"
@@ -1590,64 +1845,64 @@
 msgid "Error clearing up break"
 msgstr "Chyba při zotavování ze zastavení"
 
-#: common/port/usb_port.cpp:211
+#: common/port/usb_port.cpp:212
 msgid "Could not find USB device (vendor=%1 product=%2)."
 msgstr "Nemohu najít USB zařízení (poskytovatel=%1 výrobek=%2)."
 
-#: common/port/usb_port.cpp:218 common/port/usb_port.cpp:231
+#: common/port/usb_port.cpp:219 common/port/usb_port.cpp:232
 msgid "Error opening USB device."
 msgstr "Chyba při otvírání USB zařízení."
 
-#: common/port/usb_port.cpp:225
+#: common/port/usb_port.cpp:226
 msgid "Error resetting USB device."
 msgstr "Chyba při nulování USB zařízení."
 
-#: common/port/usb_port.cpp:243
+#: common/port/usb_port.cpp:244
 msgid "Configuration %1 not present: using %2"
 msgstr "Konfigurace %1 nenalezena: použiji %2"
 
-#: common/port/usb_port.cpp:247
+#: common/port/usb_port.cpp:248
 msgid "Error setting USB configuration %1."
 msgstr "Chyba nastavování konfigurace USB %1."
 
-#: common/port/usb_port.cpp:256
+#: common/port/usb_port.cpp:257
 msgid "Interface %1 not present: using %2"
 msgstr "Rozhraní %1 nenalezeno: použiji %2"
 
-#: common/port/usb_port.cpp:260
+#: common/port/usb_port.cpp:261
 msgid "Could not claim USB interface %1"
 msgstr "Nemohu přistupovat na USB rozhraní %1"
 
-#: common/port/usb_port.cpp:267
+#: common/port/usb_port.cpp:268
 #, fuzzy
 msgid "USB support disabled"
 msgstr " port nenalezen"
 
-#: common/port/usb_port.cpp:295
+#: common/port/usb_port.cpp:296
 msgid "Error sending control message to USB port."
 msgstr "Chyba při posílání řídící zprávy na USB port."
 
-#: common/port/usb_port.cpp:360
+#: common/port/usb_port.cpp:361
 msgid "Error sending data (ep=%1 res=%2)"
 msgstr "Chyba při odesílání dat (ep=%1 res=%2)"
 
-#: common/port/usb_port.cpp:361
+#: common/port/usb_port.cpp:362
 msgid "Timeout: only some data sent (%1/%2 bytes)."
 msgstr "Timeout: odeslána jen některá data (%1/%2 bytů)."
 
-#: common/port/usb_port.cpp:364
+#: common/port/usb_port.cpp:365
 msgid "Nothing sent: retrying..."
 msgstr "Nic neodesláno: zkouším znovu..."
 
-#: common/port/usb_port.cpp:394
+#: common/port/usb_port.cpp:395
 msgid "Error receiving data (ep=%1 res=%2)"
 msgstr "Chyba při příjmu dat (ep=%1 res=%2)"
 
-#: common/port/usb_port.cpp:395
+#: common/port/usb_port.cpp:396
 msgid "Timeout: only some data received (%1/%2 bytes)."
 msgstr "Timeout: přijata jen některá data (%1/%2 bytů)."
 
-#: common/port/usb_port.cpp:402
+#: common/port/usb_port.cpp:403
 msgid "Nothing received: retrying..."
 msgstr "Nic nepřijato: zkouším znovu..."
 
@@ -1659,27 +1914,27 @@
 msgid "Unsupported"
 msgstr "Nepodporováno"
 
-#: devices/base/device_group.cpp:225 libgui/breakpoint_view.cpp:44
+#: devices/base/device_group.cpp:224 libgui/breakpoint_view.cpp:44
 msgid "Status"
 msgstr "Stav"
 
-#: devices/base/device_group.cpp:236
+#: devices/base/device_group.cpp:235
 msgid "Alternatives"
 msgstr "Alternativy"
 
-#: devices/base/device_group.cpp:250
+#: devices/base/device_group.cpp:249
 msgid "Packaging"
 msgstr "Pouzdro"
 
-#: devices/base/device_group.cpp:299
+#: devices/base/device_group.cpp:301
 msgid "Temperature range: "
 msgstr "Rozsah teplot: "
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "F (MHz)"
 msgstr "F (MHz)"
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "Vdd (V)"
 msgstr "Vdd (V)"
 
@@ -7860,6 +8115,25 @@
 msgid "Your emails"
 msgstr "Nastavit e-mail..."
 
+#~ msgid "replace this with information about your translation team"
+#~ msgstr "nahradit za informace o vašem překladatelském týmu"
+
+#~ msgid "the 2nd argument is a list of name+address, one on each line"
+#~ msgstr "druhý parametr je seznam jméno+adresa, po jednom na každý řádek"
+
+#~ msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
+#~ msgstr "Použijte prosím %1 k nahlášení chyby, nepište přímo autorům.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%1:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%1:\n"
+
+#~ msgid "Could not write to temporary file."
+#~ msgstr "Nemohu zapisovat do dočasného souboru."
+
 #~ msgid "&Configure Email Address..."
 #~ msgstr "&Nastavit e-mail."
 
@@ -7915,9 +8189,6 @@
 #~ msgid "Forward"
 #~ msgstr "Vpřed"
 
-#~ msgid "Help Improve the Application"
-#~ msgstr "Pomozte vylepšit aplikaci"
-
 #~ msgid "I Do not Like..."
 #~ msgstr "Nelíbí se mi..."
 

Modified: trunk/piklab_kde4/po/de.po
===================================================================
--- trunk/piklab_kde4/po/de.po	2012-07-02 00:14:42 UTC (rev 2920)
+++ trunk/piklab_kde4/po/de.po	2012-07-02 00:16:48 UTC (rev 2921)
@@ -7,7 +7,7 @@
 "Project-Id-Version: Piklab V0.13.1\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2012-06-03 14:24-0700\n"
+"POT-Creation-Date: 2012-07-01 17:15-0700\n"
 "PO-Revision-Date: 2007-05-21 14:28+0100\n"
 "Last-Translator: Stefan von Halenbach <vonHalenbach at users dot sf .net>\n"
 "Language-Team: Stefan von Halenbach <vonHalenbach at users sf dot net>\n"
@@ -1120,6 +1120,18 @@
 msgid "File not opened."
 msgstr "Datei wurde nicht geöffnet."
 
+#: common/global/pfile.cpp:130 common/kde/kde_pfile.cpp:25
+msgid "Could not create temporary file."
+msgstr "Kann temporäre Datei nicht erstellen."
+
+#: common/global/pfile.cpp:131 common/kde/kde_pfile.cpp:26
+#: common/kde/kde_pfile.cpp:65 common/nokde/nokde_pfile.cpp:20
+#: common/nokde/nokde_pfile.cpp:38 libgui/project_manager.cpp:293
+#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
+#: tools/list/compile_manager.cpp:74
+msgid "File: %1"
+msgstr "Datei: %1"
+
 #: common/global/xml_data_file.cpp:40
 #, fuzzy
 msgid "Error opening file: %1"
@@ -1179,20 +1191,6 @@
 msgid "Select File"
 msgstr "Wähle Datei"
 
-#: common/kde/kde_pfile.cpp:25 common/kde/kde_pfile.cpp:105
-#: common/nokde/nokde_pfile.cpp:79
-msgid "Could not create temporary file."
-msgstr "Kann temporäre Datei nicht erstellen."
-
-#: common/kde/kde_pfile.cpp:26 common/kde/kde_pfile.cpp:65
-#: common/kde/kde_pfile.cpp:106 common/nokde/nokde_pfile.cpp:20
-#: common/nokde/nokde_pfile.cpp:38 common/nokde/nokde_pfile.cpp:66
-#: common/nokde/nokde_pfile.cpp:80 libgui/project_manager.cpp:293
-#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
-#: tools/list/compile_manager.cpp:74
-msgid "File: %1"
-msgstr "Datei: %1"
-
 #: common/kde/kde_pfile.cpp:47
 msgid "Could not save file."
 msgstr "Kann Datei nicht speichern."
@@ -1282,113 +1280,366 @@
 msgid "Settings..."
 msgstr "Automatische Erkennung..."
 
-#: common/nokde/nokde_kaboutdata.cpp:380
-msgid "replace this with information about your translation team"
-msgstr ""
-
-#: common/nokde/nokde_kaboutdata.cpp:436
+#: common/nokde/nokde_kaboutdata.cpp:274
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
 "licensing terms.\n"
 msgstr ""
 
-#: common/nokde/nokde_kaboutdata.cpp:443
+#: common/nokde/nokde_kaboutdata.cpp:280
 msgid "This program is distributed under the terms of the %1."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:528
-#: common/nokde/nokde_kcmdlineargs.cpp:544
+#: common/nokde/nokde_kaboutdata.cpp:305
+msgctxt "@item license (short name)"
+msgid "GPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:306
+msgctxt "@item license"
+msgid "GNU General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:309
+msgctxt "@item license (short name)"
+msgid "LGPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:310
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:313
+msgctxt "@item license (short name)"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:314
+msgctxt "@item license"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:317
+msgctxt "@item license (short name)"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:318
+msgctxt "@item license"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:321
+msgctxt "@item license (short name)"
+msgid "QPL v1.0"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:322
+msgctxt "@item license"
+msgid "Q Public License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:325
+msgctxt "@item license (short name)"
+msgid "GPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:326
+msgctxt "@item license"
+msgid "GNU General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:329
+msgctxt "@item license (short name)"
+msgid "LGPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:330
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:334
+#, fuzzy
+msgctxt "@item license"
+msgid "Custom"
+msgstr "Anpassen"
+
+#: common/nokde/nokde_kaboutdata.cpp:337
+#, fuzzy
+msgctxt "@item license"
+msgid "Not specified"
+msgstr "Bauteil nicht angegeben."
+
+#: common/nokde/nokde_kaboutdata.cpp:878
+msgctxt "replace this with information about your translation team"
+msgid ""
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a href=\"http://l10n.kde.org\">http://l10n.kde."
+"org</a></p>"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:273
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:275
+msgid "Use the QWS display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:278
+msgid "Restore the application for the given 'sessionId'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:279
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:280
+msgid ""
+"Limits the number of colors allocated in the color\n"
+"cube on an 8-bit display, if the application is\n"
+"using the QApplication::ManyColor color\n"
+"specification"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:281
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:282
+msgid ""
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:283
+msgid "switches to synchronous mode for debugging"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:285
+msgid "defines the application font"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:287
+msgid ""
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:289
+msgid "sets the default foreground color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:291
+msgid "sets the default button color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:292
+msgid "sets the application name"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:293
+msgid "sets the application title (caption)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:294
+msgid "load the testability framework"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:296
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:297
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:298
+msgid "set XIM server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:299
+#, fuzzy
+msgid "disable XIM"
+msgstr "Ausgeschalten"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:302
+msgid "forces the application to run as QWS Server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:304
+msgid "mirrors the whole layout of widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:305
+msgid "applies the Qt stylesheet to the application widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:306
+msgid ""
+"use a different graphics system instead of the default one, options are "
+"raster and opengl (experimental)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:308
+msgid "Use 'caption' as name in the titlebar"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:309
+msgid "Use 'icon' as the application icon"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:310
+#, fuzzy
+msgid "Use alternative configuration file"
+msgstr "Hauptkonfiguration"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:311
+msgid "Disable crash handler, to get core dumps"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:313
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:315
+msgid "sets the application GUI style"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:316
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format (usually WidthxHeight+XPos+YPos)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:434
+msgid "KDE Application"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:493
+msgid "Qt"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:496
+msgid "KDE"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:799
+#: common/nokde/nokde_kcmdlineargs.cpp:815
 msgid "Unknown option '%1'."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:552
+#: common/nokde/nokde_kcmdlineargs.cpp:823
+#, fuzzy
+msgctxt "@info:shell %1 is cmdoption name"
 msgid "'%1' missing."
 msgstr "'%1' fehlt."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:651
-msgid "the 2nd argument is a list of name+address, one on each line"
+#: common/nokde/nokde_kcmdlineargs.cpp:889
+msgctxt ""
+"@info:shell message on appcmd --version; do not translate 'Development "
+"Platform'%3 application name, other %n version strings"
+msgid ""
+"Qt: %1\n"
+"KDE Development Platform: %2\n"
+"%3: %4\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
-msgid "%1 was written by somebody who wants to remain anonymous."
+#: common/nokde/nokde_kcmdlineargs.cpp:914
+msgctxt "the 2nd argument is a list of name+address, one on each line"
+msgid ""
+"%1 was written by\n"
+"%2"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:917
+#, fuzzy
+msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "%1 wurde von jemandem geschrieben, der gerne Anonym bleiben wollte."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:659
-msgid ""
-"Please use http://bugs.kde.org to report bugs, do not mail the authors "
-"directly.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:924
+msgid "Please use http://bugs.kde.org to report bugs.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:661
-msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:926
+msgid "Please report bugs to %1.\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:681
+#: common/nokde/nokde_kcmdlineargs.cpp:963
 msgid "Unexpected argument '%1'."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:790
+#: common/nokde/nokde_kcmdlineargs.cpp:1087
 msgid "Use --help to get a list of available command line options."
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:809
-msgid ""
-"\n"
-"%1:\n"
-msgstr ""
-"\n"
-"%1:\n"
-
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_kcmdlineargs.cpp:1110
 msgid "[options] "
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:825
+#: common/nokde/nokde_kcmdlineargs.cpp:1117
 msgid "[%1-options]"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:845
+#: common/nokde/nokde_kcmdlineargs.cpp:1138
 msgid "Usage: %1 %2\n"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:848
-msgid "Generic options"
-msgstr ""
+#: common/nokde/nokde_kcmdlineargs.cpp:1141
+#, fuzzy
+msgid ""
+"\n"
+"Generic options:\n"
+msgstr "%1 Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:849
+#: common/nokde/nokde_kcmdlineargs.cpp:1143
 msgid "Show help about options"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_kcmdlineargs.cpp:1151
 msgid "Show %1 specific options"
 msgstr "Zeige spezielle Optionen von %1"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:864
+#: common/nokde/nokde_kcmdlineargs.cpp:1158
 msgid "Show all options"
 msgstr "Zeige alle Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:865
+#: common/nokde/nokde_kcmdlineargs.cpp:1159
 msgid "Show author information"
 msgstr "Zeige Informationen über die Autoren"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:866
+#: common/nokde/nokde_kcmdlineargs.cpp:1160
 msgid "Show version information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:867
+#: common/nokde/nokde_kcmdlineargs.cpp:1161
 msgid "Show license information"
 msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:868
+#: common/nokde/nokde_kcmdlineargs.cpp:1162
 msgid "End of options"
 msgstr "Keine weiteren Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:890
-msgid "%1 options"
+#: common/nokde/nokde_kcmdlineargs.cpp:1183
+#, fuzzy
+msgid ""
+"\n"
+"%1 options:\n"
 msgstr "%1 Optionen"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:892
+#: common/nokde/nokde_kcmdlineargs.cpp:1185
 msgid ""
 "\n"
 "Options:\n"
@@ -1396,7 +1647,7 @@
 "\n"
 "Optionen:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:953
+#: common/nokde/nokde_kcmdlineargs.cpp:1243
 msgid ""
 "\n"
 "Arguments:\n"
@@ -1404,18 +1655,18 @@
 "\n"
 "Argumente:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1320
+#: common/nokde/nokde_kcmdlineargs.cpp:1597
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 
+#: common/nokde/nokde_kcmdlineargs.cpp:1598
+msgid "KDE-tempfile"
+msgstr ""
+
 #: common/nokde/nokde_pfile.cpp:19
 msgid "Could not open file for writing."
 msgstr "Kann Datei nicht zum Schreiben öffnen."
 
-#: common/nokde/nokde_pfile.cpp:65
-msgid "Could not write to temporary file."
-msgstr ""
-
 #: common/nokde/nokde_purl.cpp:15
 #, fuzzy
 msgid "Could not copy non-local file"
@@ -1556,64 +1807,64 @@
 msgid "Error clearing up break"
 msgstr ""
 
-#: common/port/usb_port.cpp:211
+#: common/port/usb_port.cpp:212
 msgid "Could not find USB device (vendor=%1 product=%2)."
 msgstr "Kann USB Gerät nicht finden. (Hersteller=%1 Produkt=%2)."
 
-#: common/port/usb_port.cpp:218 common/port/usb_port.cpp:231
+#: common/port/usb_port.cpp:219 common/port/usb_port.cpp:232
 msgid "Error opening USB device."
 msgstr "Fehler beim Öffnen des USB-Gerätes."
 
-#: common/port/usb_port.cpp:225
+#: common/port/usb_port.cpp:226
 msgid "Error resetting USB device."
 msgstr "Fehler beim Reset des USB-Gerätes."
 
-#: common/port/usb_port.cpp:243
+#: common/port/usb_port.cpp:244
 msgid "Configuration %1 not present: using %2"
 msgstr ""
 
-#: common/port/usb_port.cpp:247
+#: common/port/usb_port.cpp:248
 msgid "Error setting USB configuration %1."
 msgstr ""
 
-#: common/port/usb_port.cpp:256
+#: common/port/usb_port.cpp:257
 msgid "Interface %1 not present: using %2"
 msgstr ""
 
-#: common/port/usb_port.cpp:260
+#: common/port/usb_port.cpp:261
 msgid "Could not claim USB interface %1"
 msgstr "Kann USB-Anschluß %1 nicht einbinden"
 
-#: common/port/usb_port.cpp:267
+#: common/port/usb_port.cpp:268
 #, fuzzy
 msgid "USB support disabled"
 msgstr " Keinen Port erkannt"
 
-#: common/port/usb_port.cpp:295
+#: common/port/usb_port.cpp:296
 msgid "Error sending control message to USB port."
 msgstr ""
 
-#: common/port/usb_port.cpp:360
+#: common/port/usb_port.cpp:361
 msgid "Error sending data (ep=%1 res=%2)"
 msgstr ""
 
-#: common/port/usb_port.cpp:361
+#: common/port/usb_port.cpp:362
 msgid "Timeout: only some data sent (%1/%2 bytes)."
 msgstr ""
 
-#: common/port/usb_port.cpp:364
+#: common/port/usb_port.cpp:365
 msgid "Nothing sent: retrying..."
 msgstr "Nichts gesendet: wiederhole..."
 
-#: common/port/usb_port.cpp:394
+#: common/port/usb_port.cpp:395
 msgid "Error receiving data (ep=%1 res=%2)"
 msgstr ""
 
-#: common/port/usb_port.cpp:395
+#: common/port/usb_port.cpp:396
 msgid "Timeout: only some data received (%1/%2 bytes)."
 msgstr ""
 
-#: common/port/usb_port.cpp:402
+#: common/port/usb_port.cpp:403
 msgid "Nothing received: retrying..."
 msgstr "Nichts empfangen: wiederhole..."
 
@@ -1625,27 +1876,27 @@
 msgid "Unsupported"
 msgstr "Nicht unterstützt"
 
-#: devices/base/device_group.cpp:225 libgui/breakpoint_view.cpp:44
+#: devices/base/device_group.cpp:224 libgui/breakpoint_view.cpp:44
 msgid "Status"
 msgstr "Status"
 
-#: devices/base/device_group.cpp:236
+#: devices/base/device_group.cpp:235
 msgid "Alternatives"
 msgstr "Weitere Optionen"
 
-#: devices/base/device_group.cpp:250
+#: devices/base/device_group.cpp:249
 msgid "Packaging"
 msgstr "Gehäuse"
 
-#: devices/base/device_group.cpp:299
+#: devices/base/device_group.cpp:301
 msgid "Temperature range: "
 msgstr "Temperaturbereich: "
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "F (MHz)"
 msgstr ""
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "Vdd (V)"
 msgstr "Vdd (V)"
 
@@ -7659,6 +7910,13 @@
 msgid "Your emails"
 msgstr "Einstellung der email..."
 
+#~ msgid ""
+#~ "\n"
+#~ "%1:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%1:\n"
+
 #~ msgid "&Configure Email Address..."
 #~ msgstr "&e-mail eintragen..."
 

Modified: trunk/piklab_kde4/po/es.po
===================================================================
--- trunk/piklab_kde4/po/es.po	2012-07-02 00:14:42 UTC (rev 2920)
+++ trunk/piklab_kde4/po/es.po	2012-07-02 00:16:48 UTC (rev 2921)
@@ -22,7 +22,7 @@
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2012-06-03 14:24-0700\n"
+"POT-Creation-Date: 2012-07-01 17:15-0700\n"
 "PO-Revision-Date: 2008-11-19 23:46+0000\n"
 "Last-Translator: Santiago González <san...@gm...>\n"
 "Language-Team: Spanish \n"
@@ -1083,6 +1083,18 @@
 msgid "File not opened."
 msgstr "Archivo no abierto."
 
+#: common/global/pfile.cpp:130 common/kde/kde_pfile.cpp:25
+msgid "Could not create temporary file."
+msgstr "No se pudo crear archivo temporal."
+
+#: common/global/pfile.cpp:131 common/kde/kde_pfile.cpp:26
+#: common/kde/kde_pfile.cpp:65 common/nokde/nokde_pfile.cpp:20
+#: common/nokde/nokde_pfile.cpp:38 libgui/project_manager.cpp:293
+#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
+#: tools/list/compile_manager.cpp:74
+msgid "File: %1"
+msgstr "Archivo: %1"
+
 #: common/global/xml_data_file.cpp:40
 msgid "Error opening file: %1"
 msgstr "Error al abrir archivo: %1"
@@ -1140,20 +1152,6 @@
 msgid "Select File"
 msgstr "Seleccionar Archivo"
 
-#: common/kde/kde_pfile.cpp:25 common/kde/kde_pfile.cpp:105
-#: common/nokde/nokde_pfile.cpp:79
-msgid "Could not create temporary file."
-msgstr "No se pudo crear archivo temporal."
-
-#: common/kde/kde_pfile.cpp:26 common/kde/kde_pfile.cpp:65
-#: common/kde/kde_pfile.cpp:106 common/nokde/nokde_pfile.cpp:20
-#: common/nokde/nokde_pfile.cpp:38 common/nokde/nokde_pfile.cpp:66
-#: common/nokde/nokde_pfile.cpp:80 libgui/project_manager.cpp:293
-#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
-#: tools/list/compile_manager.cpp:74
-msgid "File: %1"
-msgstr "Archivo: %1"
-
 #: common/kde/kde_pfile.cpp:47
 msgid "Could not save file."
 msgstr "No se pudo grabar archivo."
@@ -1245,11 +1243,7 @@
 msgid "Settings..."
 msgstr "Configuración..."
 
-#: common/nokde/nokde_kaboutdata.cpp:380
-msgid "replace this with information about your translation team"
-msgstr "reemplazar esta información acerca del grupo de traducción"
-
-#: common/nokde/nokde_kaboutdata.cpp:436
+#: common/nokde/nokde_kaboutdata.cpp:274
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -1259,105 +1253,365 @@
 "Por favor comprobar la documentación de la fuente para\n"
 "términos de licencia.\n"
 
-#: common/nokde/nokde_kaboutdata.cpp:443
+#: common/nokde/nokde_kaboutdata.cpp:280
 msgid "This program is distributed under the terms of the %1."
 msgstr "Este programa es distribuido bajo las condiciones de %1."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:528
-#: common/nokde/nokde_kcmdlineargs.cpp:544
+#: common/nokde/nokde_kaboutdata.cpp:305
+msgctxt "@item license (short name)"
+msgid "GPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:306
+msgctxt "@item license"
+msgid "GNU General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:309
+msgctxt "@item license (short name)"
+msgid "LGPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:310
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:313
+msgctxt "@item license (short name)"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:314
+msgctxt "@item license"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:317
+msgctxt "@item license (short name)"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:318
+msgctxt "@item license"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:321
+msgctxt "@item license (short name)"
+msgid "QPL v1.0"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:322
+msgctxt "@item license"
+msgid "Q Public License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:325
+msgctxt "@item license (short name)"
+msgid "GPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:326
+msgctxt "@item license"
+msgid "GNU General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:329
+msgctxt "@item license (short name)"
+msgid "LGPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:330
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:334
+#, fuzzy
+msgctxt "@item license"
+msgid "Custom"
+msgstr "Personalizado"
+
+#: common/nokde/nokde_kaboutdata.cpp:337
+#, fuzzy
+msgctxt "@item license"
+msgid "Not specified"
+msgstr "Ningún comando especificado"
+
+#: common/nokde/nokde_kaboutdata.cpp:878
+msgctxt "replace this with information about your translation team"
+msgid ""
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a href=\"http://l10n.kde.org\">http://l10n.kde."
+"org</a></p>"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:273
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:275
+msgid "Use the QWS display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:278
+msgid "Restore the application for the given 'sessionId'"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:279
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:280
+msgid ""
+"Limits the number of colors allocated in the color\n"
+"cube on an 8-bit display, if the application is\n"
+"using the QApplication::ManyColor color\n"
+"specification"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:281
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:282
+msgid ""
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:283
+#, fuzzy
+msgid "switches to synchronous mode for debugging"
+msgstr "Deshabilitando Watchdog timer para depurado"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:285
+#, fuzzy
+msgid "defines the application font"
+msgstr "Ayude a mejorar la aplicación"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:287
+msgid ""
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:289
+msgid "sets the default foreground color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:291
+msgid "sets the default button color"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:292
+#, fuzzy
+msgid "sets the application name"
+msgstr "Ayude a mejorar la aplicación"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:293
+msgid "sets the application title (caption)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:294
+msgid "load the testability framework"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:296
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:297
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:298
+msgid "set XIM server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:299
+#, fuzzy
+msgid "disable XIM"
+msgstr "Deshabilitado"
+
+#: common/nokde/nokde_kcmdlineargs.cpp:302
+msgid "forces the application to run as QWS Server"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:304
+msgid "mirrors the whole layout of widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:305
+msgid "applies the Qt stylesheet to the application widgets"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:306
+msgid ""
+"use a different graphics system instead of the default one, options are "
+"raster and opengl (experimental)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:308
+msgid "Use 'caption' as name in the titlebar"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:309
+msgid "Use 'icon' as the application icon"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:310
+#, fuzzy
+msgid "Use alternative configuration file"
+msgstr "Usando puerto del archivo de configuración."
+
+#: common/nokde/nokde_kcmdlineargs.cpp:311
+msgid "Disable crash handler, to get core dumps"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:313
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:315
+msgid "sets the application GUI style"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:316
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format (usually WidthxHeight+XPos+YPos)"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:434
+msgid "KDE Application"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:493
+msgid "Qt"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:496
+msgid "KDE"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:799
+#: common/nokde/nokde_kcmdlineargs.cpp:815
 msgid "Unknown option '%1'."
 msgstr "Opción desconocida '%1'."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:552
+#: common/nokde/nokde_kcmdlineargs.cpp:823
+#, fuzzy
+msgctxt "@info:shell %1 is cmdoption name"
 msgid "'%1' missing."
 msgstr "'%1' desaparecido."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:651
-msgid "the 2nd argument is a list of name+address, one on each line"
-msgstr "el 2do argumento es una lista de nombre+dirección, una por cada linea"
+#: common/nokde/nokde_kcmdlineargs.cpp:889
+msgctxt ""
+"@info:shell message on appcmd --version; do not translate 'Development "
+"Platform'%3 application name, other %n version strings"
+msgid ""
+"Qt: %1\n"
+"KDE Development Platform: %2\n"
+"%3: %4\n"
+msgstr ""
 
-#: common/nokde/nokde_kcmdlineargs.cpp:654
-msgid "%1 was written by somebody who wants to remain anonymous."
+#: common/nokde/nokde_kcmdlineargs.cpp:914
+msgctxt "the 2nd argument is a list of name+address, one on each line"
+msgid ""
+"%1 was written by\n"
+"%2"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:917
+#, fuzzy
+msgid "This application was written by somebody who wants to remain anonymous."
 msgstr "%1 escrito por alguien que prefiere el anonimato."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:659
-msgid ""
-"Please use http://bugs.kde.org to report bugs, do not mail the authors "
-"directly.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:924
+#, fuzzy
+msgid "Please use http://bugs.kde.org to report bugs.\n"
 msgstr ""
 "Por favor use http://bugs.kde.org para reportar errores, no envide email "
 "directamente a los autores.\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:661
-msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
+#: common/nokde/nokde_kcmdlineargs.cpp:926
+msgid "Please report bugs to %1.\n"
 msgstr ""
-"Por favor use %1 para reportar errores, no envíe email directamente a los "
-"autores.\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:681
+#: common/nokde/nokde_kcmdlineargs.cpp:963
 msgid "Unexpected argument '%1'."
 msgstr "Argumento inesperado '%1'."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:790
+#: common/nokde/nokde_kcmdlineargs.cpp:1087
 msgid "Use --help to get a list of available command line options."
 msgstr "Usar --help para obtener una lista de opciones de comando."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:809
-#, fuzzy
-msgid ""
-"\n"
-"%1:\n"
-msgstr "%1:"
-
-#: common/nokde/nokde_kcmdlineargs.cpp:818
+#: common/nokde/nokde_kcmdlineargs.cpp:1110
 msgid "[options] "
 msgstr "[opciones]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:825
+#: common/nokde/nokde_kcmdlineargs.cpp:1117
 msgid "[%1-options]"
 msgstr "[%1-opciones]"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:845
+#: common/nokde/nokde_kcmdlineargs.cpp:1138
 msgid "Usage: %1 %2\n"
 msgstr "Uso: %1 %2\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:848
-msgid "Generic options"
+#: common/nokde/nokde_kcmdlineargs.cpp:1141
+#, fuzzy
+msgid ""
+"\n"
+"Generic options:\n"
 msgstr "Opciones genéricas"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:849
+#: common/nokde/nokde_kcmdlineargs.cpp:1143
 msgid "Show help about options"
 msgstr "Mostrar ayuda sobre opciones"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:857
+#: common/nokde/nokde_kcmdlineargs.cpp:1151
 msgid "Show %1 specific options"
 msgstr "Mostrar opciones específicas de %1"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:864
+#: common/nokde/nokde_kcmdlineargs.cpp:1158
 msgid "Show all options"
 msgstr "Mostrar todas las opciones"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:865
+#: common/nokde/nokde_kcmdlineargs.cpp:1159
 msgid "Show author information"
 msgstr "Mostrar información del autor"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:866
+#: common/nokde/nokde_kcmdlineargs.cpp:1160
 msgid "Show version information"
 msgstr "Mostrar información de versión"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:867
+#: common/nokde/nokde_kcmdlineargs.cpp:1161
 msgid "Show license information"
 msgstr "Mostrar información de licencia"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:868
+#: common/nokde/nokde_kcmdlineargs.cpp:1162
 msgid "End of options"
 msgstr "Fin de opciones"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:890
-msgid "%1 options"
+#: common/nokde/nokde_kcmdlineargs.cpp:1183
+#, fuzzy
+msgid ""
+"\n"
+"%1 options:\n"
 msgstr "%1 opciones"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:892
+#: common/nokde/nokde_kcmdlineargs.cpp:1185
 msgid ""
 "\n"
 "Options:\n"
@@ -1365,7 +1619,7 @@
 "\n"
 "Opciones:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:953
+#: common/nokde/nokde_kcmdlineargs.cpp:1243
 msgid ""
 "\n"
 "Arguments:\n"
@@ -1373,19 +1627,19 @@
 "\n"
 "Argumentos:\n"
 
-#: common/nokde/nokde_kcmdlineargs.cpp:1320
+#: common/nokde/nokde_kcmdlineargs.cpp:1597
 msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
 "Los archivos/URLs abiertos por la aplicación serán borrados despues de su uso"
 
+#: common/nokde/nokde_kcmdlineargs.cpp:1598
+msgid "KDE-tempfile"
+msgstr ""
+
 #: common/nokde/nokde_pfile.cpp:19
 msgid "Could not open file for writing."
 msgstr "No se pudo abrir archivo para escritura."
 
-#: common/nokde/nokde_pfile.cpp:65
-msgid "Could not write to temporary file."
-msgstr "No se pudo escribir a archivo temporal."
-
 #: common/nokde/nokde_purl.cpp:15
 #, fuzzy
 msgid "Could not copy non-local file"
@@ -1527,63 +1781,63 @@
 msgid "Error clearing up break"
 msgstr ""
 
-#: common/port/usb_port.cpp:211
+#: common/port/usb_port.cpp:212
 msgid "Could not find USB device (vendor=%1 product=%2)."
 msgstr "No se pudo encontrar dispositivo USB (vendor=%1 product=%2)."
 
-#: common/port/usb_port.cpp:218 common/port/usb_port.cpp:231
+#: common/port/usb_port.cpp:219 common/port/usb_port.cpp:232
 msgid "Error opening USB device."
 msgstr "Error al abrir dispositivo USB."
 
-#: common/port/usb_port.cpp:225
+#: common/port/usb_port.cpp:226
 msgid "Error resetting USB device."
 msgstr "Error al reiniciar dispositivo USB."
 
-#: common/port/usb_port.cpp:243
+#: common/port/usb_port.cpp:244
 msgid "Configuration %1 not present: using %2"
 msgstr "Configuración %1 no presente: usando %2"
 
-#: common/port/usb_port.cpp:247
+#: common/port/usb_port.cpp:248
 msgid "Error setting USB configuration %1."
 msgstr "Error al establecer configuración USB %1."
 
-#: common/port/usb_port.cpp:256
+#: common/port/usb_port.cpp:257
 msgid "Interface %1 not present: using %2"
 msgstr "Interface %1 no existe: usando %2"
 
-#: common/port/usb_port.cpp:260
+#: common/port/usb_port.cpp:261
 msgid "Could not claim USB interface %1"
 msgstr "No se pudo acceder a la interface USB %1"
 
-#: common/port/usb_port.cpp:267
+#: common/port/usb_port.cpp:268
 msgid "USB support disabled"
 msgstr "Soporte de USB deshabilitado"
 
-#: common/port/usb_port.cpp:295
+#: common/port/usb_port.cpp:296
 msgid "Error sending control message to USB port."
 msgstr "Error al enviar mensaje de control al puerto USB."
 
-#: common/port/usb_port.cpp:360
+#: common/port/usb_port.cpp:361
 msgid "Error sending data (ep=%1 res=%2)"
 msgstr "Error al enviar datos (ep=%1 res=%2)"
 
-#: common/port/usb_port.cpp:361
+#: common/port/usb_port.cpp:362
 msgid "Timeout: only some data sent (%1/%2 bytes)."
 msgstr "Timeout: solo algunos datos enviados (%1/%2 bytes)."
 
-#: common/port/usb_port.cpp:364
+#: common/port/usb_port.cpp:365
 msgid "Nothing sent: retrying..."
 msgstr "Nada enviado: reintentando..."
 
-#: common/port/usb_port.cpp:394
+#: common/port/usb_port.cpp:395
 msgid "Error receiving data (ep=%1 res=%2)"
 msgstr "Error al recibir datos (ep=%1 res=%2)"
 
-#: common/port/usb_port.cpp:395
+#: common/port/usb_port.cpp:396
 msgid "Timeout: only some data received (%1/%2 bytes)."
 msgstr "Timeout: solo algunos datos recibidos (%1/%2 bytes)."
 
-#: common/port/usb_port.cpp:402
+#: common/port/usb_port.cpp:403
 msgid "Nothing received: retrying..."
 msgstr "Nada recibido: reintentando..."
 
@@ -1595,27 +1849,27 @@
 msgid "Unsupported"
 msgstr "No soportado"
 
-#: devices/base/device_group.cpp:225 libgui/breakpoint_view.cpp:44
+#: devices/base/device_group.cpp:224 libgui/breakpoint_view.cpp:44
 msgid "Status"
 msgstr "Estado"
 
-#: devices/base/device_group.cpp:236
+#: devices/base/device_group.cpp:235
 msgid "Alternatives"
 msgstr "Alternativas"
 
-#: devices/base/device_group.cpp:250
+#: devices/base/device_group.cpp:249
 msgid "Packaging"
 msgstr "Encapsulado"
 
-#: devices/base/device_group.cpp:299
+#: devices/base/device_group.cpp:301
 msgid "Temperature range: "
 msgstr "Rango de temperatura: "
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "F (MHz)"
 msgstr ""
 
-#: devices/base/device_group.cpp:314
+#: devices/base/device_group.cpp:323
 msgid "Vdd (V)"
 msgstr ""
 
@@ -7633,6 +7887,27 @@
 msgid "Your emails"
 msgstr "Configurar correo..."
 
+#~ msgid "replace this with information about your translation team"
+#~ msgstr "reemplazar esta información acerca del grupo de traducción"
+
+#~ msgid "the 2nd argument is a list of name+address, one on each line"
+#~ msgstr ""
+#~ "el 2do argumento es una lista de nombre+dirección, una por cada linea"
+
+#~ msgid "Please use %1 to report bugs, do not mail the authors directly.\n"
+#~ msgstr ""
+#~ "Por favor use %1 para reportar errores, no envíe email directamente a los "
+#~ "autores.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "%1:\n"
+#~ msgstr "%1:"
+
+#~ msgid "Could not write to temporary file."
+#~ msgstr "No se pudo escribir a archivo temporal."
+
 #~ msgid "&Break<Translators: it is the verb>"
 #~ msgstr "&Parar"
 
@@ -7695,9 +7970,6 @@
 #~ msgid "Forward"
 #~ msgstr "Adelante"
 
-#~ msgid "Help Improve the Application"
-#~ msgstr "Ayude a mejorar la aplicación"
-
 #~ msgid "I Do not Like..."
 #~ msgstr "No me gusta..."
 

Modified: trunk/piklab_kde4/po/fr.po
===================================================================
--- trunk/piklab_kde4/po/fr.po	2012-07-02 00:14:42 UTC (rev 2920)
+++ trunk/piklab_kde4/po/fr.po	2012-07-02 00:16:48 UTC (rev 2921)
@@ -8,7 +8,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2012-06-03 14:24-0700\n"
+"POT-Creation-Date: 2012-07-01 17:15-0700\n"
 "PO-Revision-Date: 2010-06-22 21:50+0200\n"
 "Last-Translator: Nicolas Hadacek <ha...@kd...>\n"
 "Language-Team: \n"
@@ -1060,6 +1060,18 @@
 msgid "File not opened."
 msgstr "Le fichier n'est pas ouvert."
 
+#: common/global/pfile.cpp:130 common/kde/kde_pfile.cpp:25
+msgid "Could not create temporary file."
+msgstr "Impossible de créer un fichier temporaire."
+
+#: common/global/pfile.cpp:131 common/kde/kde_pfile.cpp:26
+#: common/kde/kde_pfile.cpp:65 common/nokde/nokde_pfile.cpp:20
+#: common/nokde/nokde_pfile.cpp:38 libgui/project_manager.cpp:293
+#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
+#: tools/list/compile_manager.cpp:74
+msgid "File: %1"
+msgstr "Fichier : %1"
+
 #: common/global/xml_data_file.cpp:40
 msgid "Error opening file: %1"
 msgstr "Erreur lors de l'ouverture du fichier : %1"
@@ -1116,20 +1128,6 @@
 msgid "Select File"
 msgstr "Sélectionner un fichier"
 
-#: common/kde/kde_pfile.cpp:25 common/kde/kde_pfile.cpp:105
-#: common/nokde/nokde_pfile.cpp:79
-msgid "Could not create temporary file."
-msgstr "Impossible de créer un fichier temporaire."
-
-#: common/kde/kde_pfile.cpp:26 common/kde/kde_pfile.cpp:65
-#: common/kde/kde_pfile.cpp:106 common/nokde/nokde_pfile.cpp:20
-#: common/nokde/nokde_pfile.cpp:38 common/nokde/nokde_pfile.cpp:66
-#: common/nokde/nokde_pfile.cpp:80 libgui/project_manager.cpp:293
-#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
-#: tools/list/compile_manager.cpp:74
-msgid "File: %1"
-msgstr "Fichier : %1"
-
 #: common/kde/kde_pfile.cpp:47
 msgid "Could not save file."
 msgstr "Impossible d'enregistrer le fichier."
@@ -1219,11 +1217,7 @@
 msgid "Settings..."
 msgstr "Réglages..."
 
-#: common/nokde/nokde_kaboutdata.cpp:380
-msgid "replace this with information about your translation team"
-msgstr "Alain Portal <aportal AT univ-montp2 DOT fr>"
-
-#: common/nokde/nokde_kaboutdata.cpp:436
+#: common/nokde/nokde_kaboutdata.cpp:274
 msgid ""
 "No licensing terms for this program have been specified.\n"
 "Please check the documentation or the source for any\n"
@@ -1233,107 +1227,366 @@
 "Veuillez vérifier la documentation ou les sources\n"
 "pour les termes de licence.\n"
 
-#: common/nokde/nokde_kaboutdata.cpp:443
+#: common/nokde/nokde_kaboutdata.cpp:280
 msgid "This program is distributed under the terms of the %1."
 msgstr "Ce programme est distribué sous les termes de la %1."
 
-#: common/nokde/nokde_kcmdlineargs.cpp:528
-#: common/nokde/nokde_kcmdlineargs.cpp:544
+#: common/nokde/nokde_kaboutdata.cpp:305
+msgctxt "@item license (short name)"
+msgid "GPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:306
+msgctxt "@item license"
+msgid "GNU General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:309
+msgctxt "@item license (short name)"
+msgid "LGPL v2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:310
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 2"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:313
+msgctxt "@item license (short name)"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:314
+msgctxt "@item license"
+msgid "BSD License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:317
+msgctxt "@item license (short name)"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:318
+msgctxt "@item license"
+msgid "Artistic License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:321
+msgctxt "@item license (short name)"
+msgid "QPL v1.0"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:322
+msgctxt "@item license"
+msgid "Q Public License"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:325
+msgctxt "@item license (short name)"
+msgid "GPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:326
+msgctxt "@item license"
+msgid "GNU General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:329
+msgctxt "@item license (short name)"
+msgid "LGPL v3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:330
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 3"
+msgstr ""
+
+#: common/nokde/nokde_kaboutdata.cpp:334
+#, fuzzy
+msgctxt "@item license"
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: common/nokde/nokde_kaboutdata.cpp:337
+#, fuzzy
+msgctxt "@item license"
+msgid "Not specified"
+msgstr "Aucune commande spécifiée"
+
+#: common/nokde/nokde_kaboutdata.cpp:878
+msgctxt "replace this with information about your translation team"
+msgid ""
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a href=\"http://l10n.kde.org\">http://l10n.kde."
+"org</a></p>"
+msgstr ""
+
+#: common/nokde/nokde_kcmdlineargs.cpp:273
+msgid "Use the X-server display 'displayname'"
+msgstr ""
+
+#: common/nokde/nokd...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2920] trunk/piklab_kde4

From: <az...@us...> - 2012-07-02 00:14:53

Revision: 2920
          http://piklab.svn.sourceforge.net/piklab/?rev=2920&view=rev
Author:   azhyd
Date:     2012-07-02 00:14:42 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
add new 33F devices + auto-add 18J/24F/24H/30F/33F to icd2

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/number.cpp
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC802.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC804.xml
    trunk/piklab_kde4/src/progs/icd2/base/icd2.xml
    trunk/piklab_kde4/src/progs/icd2/icd2_data/icd2_data.cpp
    trunk/piklab_kde4/src/progs/icd2/xml/xml_icd2_parser.cpp
    trunk/piklab_kde4/src/xml_to_data/prog_xml_to_data.h
    trunk/piklab_kde4/test/gputils/blinker/blinker.piklab

Added Paths:
-----------
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP802.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP804.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP302.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP304.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC202.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC204.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC302.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC304.xml

Modified: trunk/piklab_kde4/src/common/common/number.cpp
===================================================================
--- trunk/piklab_kde4/src/common/common/number.cpp	2012-06-24 18:58:15 UTC (rev 2919)
+++ trunk/piklab_kde4/src/common/common/number.cpp	2012-07-02 00:14:42 UTC (rev 2920)
@@ -42,7 +42,7 @@
     value /= base.data().base;
   }
   if ( value!=0 ) {
-    qDebug("toString %s nbChars=%u", toLabel(base, tmp, ::nbChars(base, tmp)).latin1(), nbChars);
+    qWarning("incomplete toString %s nbChars=%u", toLabel(base, tmp, ::nbChars(base, tmp)).latin1(), nbChars);
   }
   return s;
 }

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP802.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP802.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP802.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2005-2009 Nicolas Hadacek <ha...@kd...>            *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ128GP802" status="IP" memory_technology="FLASH" architecture="33F" id="0x062D" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="532298" datasheet="70291" progsheet="70152" erratas="80442" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0157FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x800FFF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+    <mask name="RBSSIZ" value="0x00C0" >
+        <value value="0x0000" name="1024" />
+        <value value="0x0040" name="256"  />
+        <value value="0x0080" name="128"  />
+        <value value="0x00C0" name="0"    />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTSS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="SSSIZ"  value="0x0006" >
+        <value value="0x0000" name="65536" />
+        <value value="0x0002" name="32768"  />
+        <value value="0x0004" name="16384"  />
+        <value value="0x0006" name="0"   />
+    </mask>
+    <mask name="SSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+    <mask name="RSSSIZ" value="0x00C0" >
+        <value value="0x0000" name="4096" />
+        <value value="0x0040" name="2048" />
+        <value value="0x0080" name="256"  />
+        <value value="0x00C0" name="0"    />
+    </mask>
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00C7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+        <value value="0x0000" name="SDA1/SCL1" />
+        <value value="0x0010" name="ASDA1/ASCL1" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+
+<!--* Packages *************************************************************-->
+  <package types="spdip soic qfns" nb_pins="28" >
+  </package>
+
+</device>

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP804.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP804.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128GP804.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2005-2009 Nicolas Hadacek <ha...@kd...>            *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ128GP804" status="IP" memory_technology="FLASH" architecture="33F" id="0x062F" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="532299" datasheet="70291" progsheet="70152" erratas="80442" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0157FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x800FFF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+    <mask name="RBSSIZ" value="0x00C0" >
+        <value value="0x0000" name="1024" />
+        <value value="0x0040" name="256"  />
+        <value value="0x0080" name="128"  />
+        <value value="0x00C0" name="0"    />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTSS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="SSSIZ"  value="0x0006" >
+        <value value="0x0000" name="65536" />
+        <value value="0x0002" name="32768"  />
+        <value value="0x0004" name="16384"  />
+        <value value="0x0006" name="0"   />
+    </mask>
+    <mask name="SSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+    <mask name="RSSSIZ" value="0x00C0" >
+        <value value="0x0000" name="4096" />
+        <value value="0x0040" name="2048" />
+        <value value="0x0080" name="256"  />
+        <value value="0x00C0" name="0"    />
+    </mask>
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00C7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+      <value value="0x0000" name="SDA1/SCL1" />
+      <value value="0x0010" name="ASDA1/ASCL1" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+
+<!--* Packages *************************************************************-->
+  <package types="qfn tqfp" nb_pins="44" >
+  </package>
+
+</device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC802.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC802.xml	2012-06-24 18:58:15 UTC (rev 2919)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC802.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -160,7 +160,7 @@
     </mask>
 </config>
 
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00E7" >
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
     <mask name="FPWRT" value="0x0007" >
         <value value="0x0000" name="0" />
         <value value="0x0001" name="2" />
@@ -171,6 +171,10 @@
         <value value="0x0006" name="64" />
         <value value="0x0007" name="128" />
     </mask>
+    <mask name="ALTI2C" value="0x0010" >
+      <value value="0x0000" name="SDA1/SCL1" />
+      <value value="0x0010" name="ASDA1/ASCL1" />
+    </mask>
     <mask name="LPOL" value="0x0020" >
         <value value="0x0000" name="low" />
         <value value="0x0020" name="high" />

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC804.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC804.xml	2012-06-24 18:58:15 UTC (rev 2919)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ128MC804.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -160,7 +160,7 @@
     </mask>
 </config>
 
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00E7" >
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
     <mask name="FPWRT" value="0x0007" >
         <value value="0x0000" name="0" />
         <value value="0x0001" name="2" />
@@ -171,6 +171,10 @@
         <value value="0x0006" name="64" />
         <value value="0x0007" name="128" />
     </mask>
+    <mask name="ALTI2C" value="0x0010" >
+      <value value="0x0000" name="SDA1/SCL1" />
+      <value value="0x0010" name="ASDA1/ASCL1" />
+    </mask>
     <mask name="LPOL" value="0x0020" >
         <value value="0x0000" name="low" />
         <value value="0x0020" name="high" />

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP302.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP302.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP302.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Nicolas Hadacek <ha...@kd...>                 *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ32GP302" status="IP" memory_technology="FLASH" architecture="33F" id="0x0645" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="532304" datasheet="70292" progsheet="70152" erratas="80443 80371" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0057FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x8007FF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="IOL1WAY" value="0x0020" >
+        <value value="0x0000" name="Multiple reconfigurations" />
+        <value value="0x0020" name="One reconfiguration" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+        <value value="0x0000" name="ASDA1/ASCL1" />
+        <value value="0x0010" name="SDA1/SCL1" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<!--* Packages *************************************************************-->
+  <package types="sdip soic qfns" nb_pins="28" >
+  </package>
+
+</device>

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP304.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP304.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32GP304.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Nicolas Hadacek <ha...@kd...>                 *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ32GP304" status="IP" memory_technology="FLASH" architecture="33F" id="0x0647" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="532305" datasheet="70292" progsheet="70152" erratas="80443 80371" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0057FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x8007FF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="IOL1WAY" value="0x0020" >
+        <value value="0x0000" name="Multiple reconfigurations" />
+        <value value="0x0020" name="One reconfiguration" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+        <value value="0x0000" name="ASDA1/ASCL1" />
+        <value value="0x0010" name="SDA1/SCL1" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<!--* Packages *************************************************************-->
+  <package types="sdip soic qfns" nb_pins="28" >
+  </package>
+
+</device>

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC202.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC202.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC202.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2005-2009 Nicolas Hadacek <ha...@kd...>            *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ32MC202" status="IP" memory_technology="FLASH" architecture="33F" id="0x0F09" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="530333" datasheet="70290" progsheet="70152" erratas="80460" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0057FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x8007FF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="IOL1WAY" value="0x0020" >
+        <value value="0x0000" name="Multiple reconfigurations" />
+        <value value="0x0020" name="One reconfiguration" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+        <value value="0x0000" name="ASDA1/ASCL1" />
+        <value value="0x0010" name="SDA1/SCL1" />
+    </mask>
+    <mask name="LPOL" value="0x0020" >
+      <value value="0x0000" name="low" />
+      <value value="0x0020" name="high" />
+    </mask>
+    <mask name="HPOL" value="0x0040" >
+      <value value="0x0000" name="low" />
+      <value value="0x0040" name="high" />
+    </mask>
+    <mask name="PWMPIN" value="0x0080" >
+      <value value="0x0000" name="On" />
+      <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<!--* Packages *************************************************************-->
+  <package types="sdip soic qfns" nb_pins="28" >
+  </package>
+
+</device>

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC204.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC204.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC204.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2005-2009 Nicolas Hadacek <ha...@kd...>            *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ32MC204" status="IP" memory_technology="FLASH" architecture="33F" id="0x0F0B" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="530334" datasheet="70290" progsheet="70152" erratas="80460" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0057FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x8007FF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="IOL1WAY" value="0x0020" >
+        <value value="0x0000" name="Multiple reconfigurations" />
+        <value value="0x0020" name="One reconfiguration" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="0x0010" >
+        <value value="0x0000" name="1:32" />
+        <value value="0x0010" name="1:128" />
+    </mask>
+    <mask name="WINDIS" value="0x0040" >
+        <value value="0x0000" name="On" />
+        <value value="0x0040" name="Off" />
+    </mask>
+    <mask name="FWDTEN" value="0x0080" >
+        <value value="0x0000" name="Software" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x00F7" >
+    <mask name="FPWRT" value="0x0007" >
+        <value value="0x0000" name="0" />
+        <value value="0x0001" name="2" />
+        <value value="0x0002" name="4" />
+        <value value="0x0003" name="8" />
+        <value value="0x0004" name="16" />
+        <value value="0x0005" name="32" />
+        <value value="0x0006" name="64" />
+        <value value="0x0007" name="128" />
+    </mask>
+    <mask name="ALTI2C" value="0x0010" >
+        <value value="0x0000" name="ASDA1/ASCL1" />
+        <value value="0x0010" name="SDA1/SCL1" />
+    </mask>
+    <mask name="LPOL" value="0x0020" >
+      <value value="0x0000" name="low" />
+      <value value="0x0020" name="high" />
+    </mask>
+    <mask name="HPOL" value="0x0040" >
+      <value value="0x0000" name="low" />
+      <value value="0x0040" name="high" />
+    </mask>
+    <mask name="PWMPIN" value="0x0080" >
+      <value value="0x0000" name="On" />
+      <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x00E3" >
+    <mask name="ICS" value="0x0003" >
+        <value value="0x0000" name="EMUC3, EMUD3" />
+        <value value="0x0001" name="EMUC2, EMUD2" />
+        <value value="0x0002" name="EMUC1, EMUD1" />
+        <value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
+    </mask>
+    <mask name="JTAGEN" value="0x0020" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0020" name="On" />
+    </mask>
+    <mask name="DEBUG" value="0x0080" >
+        <value value="0x0000" name="On" />
+        <value value="0x0080" name="Off" />
+    </mask>
+</config>
+
+<!--* Packages *************************************************************-->
+  <package types="qfn tqfp" nb_pins="44" >
+  </package>
+
+</device>

Added: trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC302.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC302.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/33FJ32MC302.xml	2012-07-02 00:14:42 UTC (rev 2920)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Nicolas Hadacek <ha...@kd...>                 *-->
+<!--*                                                                      *-->
+<!--* This program is free software; you can redistribute it and/or modify *-->
+<!--* it under the terms of the GNU General Public License as published by *-->
+<!--* the Free Software Foundation; either version 2 of the License, or    *-->
+<!--* (at your option) any later version.                                  *-->
+<!--************************************************************************-->
+<device name="33FJ32MC302" status="IP" memory_technology="FLASH" architecture="33F" id="0x0601" >
+
+<!--* Documents ************************************************************-->
+  <documents webpage="532306" datasheet="70292" progsheet="70152" erratas="80443 80371" />
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="industrial" >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+  <frequency_range name="extended"   >
+    <frequency start="0"  end="40" vdd_min="3.0" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="3.0" max="3.6" nominal="3.3" />
+  <voltages name="vdd_prog" min="3.0" max="3.6" nominal="3.3"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"              start="0x000000" end="0x0057FF" />
+  <memory name="device_id"         start="0xFF0000" end="0xFF0003" />
+  <memory name="config"            start="0xF80000" end="0xF8000F" />
+  <memory name="user_ids"          start="0xF80010" end="0xF80017" rmask="0x00FF" />
+  <memory name="debug_vector"      start="0x800000" end="0x800007" />
+  <memory name="program_executive" start="0x800000" end="0x8007FF" />
+
+<!--* Configuration bits ***************************************************-->
+<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x00CF" >
+    <mask name="WRTBS" value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="BSSIZ"  value="0x0006" >
+        <value value="0x0000" name="16384" />
+        <value value="0x0002" name="8192" />
+        <value value="0x0004" name="2048" />
+        <value value="0x0006" name="0"  />
+    </mask>
+    <mask name="BSSEC" value="0x0008" >
+        <value value="0x0000" name="High Security"     />
+        <value value="0x0008" name="Standard Security" />
+    </mask>
+</config>
+
+<config offset="0x2" name="FSS" wmask="0xFFFF" bvalue="0x00CF" >
+</config>
+
+<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
+    <mask name="WRTGS"  value="0x0001" >
+        <value value="0x0000" name="All"  />
+        <value value="0x0001" name="Off" />
+    </mask>
+    <mask name="GSSEC" value="0x0006" >
+        <value value="0x0000" name="High Security" />
+        <value value="0x0002" name="High Security" />
+        <value value="0x0004" name="Standard Security" />
+        <value value="0x0006" name="Off" />
+    </mask>
+</config>
+
+<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0087" >
+    <mask name="FNOSC" value="0x0007" >
+        <value value="0x0000" name="EXTRC_F" />
+        <value value="0x0001" name="INTRC_F_PLL" />
+        <value value="0x0002" name="PRIM" />
+        <value value="0x0003" name="PRIM_PLL" />
+        <value value="0x0004" name="SECOND" />
+        <value value="0x0005" name="EXTRC_LP" />
+        <value value="0x0006" name="INTRC_F_16" />
+        <value value="0x0007" name="INTRC_F_POST" />
+    </mask>
+    <mask name="IESO" value="0x0080" >
+        <value value="0x0000" name="Off" />
+        <value value="0x0080" name="On" />
+    </mask>
+</config>
+
+<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
+    <mask name="POSCMD" value="0x0003" >
+        <value value="0x0000" name="EC" />
+        <value value="0x0001" name="XT" />
+        <value value="0x0002" name="HS" />
+        <value value="0x0003" name="Off" />
+    </mask>
+    <mask name="OSCIOFNC" value="0x0004" >
+        <value value="0x0000" name="IO" />
+        <value value="0x0004" name="Clock" />
+    </mask>
+    <mask name="IOL1WAY" value="0x0020" >
+        <value value="0x0000" name="Multiple reconfigurations" />
+        <value value="0x0020" name="One reconfiguration" />
+    </mask>
+    <mask name="FCKSM" value="0x00C0" >
+        <value value="0x0000" name="Switching on, monitor on" />
+        <value value="0x0040" name="Switching on, monitor off" />
+        <value value="0x0080" name="Switching off, monitor off" />
+        <value value="0x00C0" name="Switching off, monitor off" />
+    </mask>
+</config>
+
+<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
+    <mask name="WDTPOST" value="0x000F" >
+        <value value="0x0000" name="1:1" />
+        <value value="0x0001" name="1:2" />
+        <value value="0x0002" name="1:4" />
+        <value value="0x0003" name="1:8" />
+        <value value="0x0004" name="1:16" />
+        <value value="0x0005" name="1:32" />
+        <value value="0x0006" name="1:64" />
+        <value value="0x0007" name="1:128" />
+        <value value="0x0008" name="1:256" />
+        <value value="0x0009" name="1:512" />
+        <value value="0x000A" name="1:1024" />
+        <value value="0x000B" name="1:2048" />
+        <value value="0x000C" name="1:4096" />
+        <value value="0x000D" name="1:8192" />
+        <value value="0x000E" name="1:16384" />
+        <value value="0x000F" name="1:32768" />
+    </mask>
+    <mask name="WDTPRE" value="...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2919] trunk/www/devices

From: <az...@us...> - 2012-06-24 18:58:21

Revision: 2919
          http://piklab.svn.sourceforge.net/piklab/?rev=2919&view=rev
Author:   azhyd
Date:     2012-06-24 18:58:15 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/devices/10F200_pins_graph.png
    trunk/www/devices/10F202_pins_graph.png
    trunk/www/devices/10F204_pins_graph.png
    trunk/www/devices/10F206_pins_graph.png
    trunk/www/devices/10F220_pins_graph.png
    trunk/www/devices/10F222_pins_graph.png

Modified: trunk/www/devices/10F200_pins_graph.png
===================================================================
(Binary files differ)

Modified: trunk/www/devices/10F202_pins_graph.png
===================================================================
(Binary files differ)

Modified: trunk/www/devices/10F204_pins_graph.png
===================================================================
(Binary files differ)

Modified: trunk/www/devices/10F206_pins_graph.png
===================================================================
(Binary files differ)

Modified: trunk/www/devices/10F220_pins_graph.png
===================================================================
(Binary files differ)

Modified: trunk/www/devices/10F222_pins_graph.png
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2918] trunk/piklab_kde4

From: <az...@us...> - 2012-06-24 18:54:43

Revision: 2918
          http://piklab.svn.sourceforge.net/piklab/?rev=2918&view=rev
Author:   azhyd
Date:     2012-06-24 18:54:36 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
fix pinout for 10F2XX

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml

Added Paths:
-----------
    trunk/piklab_kde4/piklab_qt4.kdev4

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/Changelog	2012-06-24 18:54:36 UTC (rev 2918)
@@ -1,7 +1,8 @@
-0.16.1 (11 June 2012)
+0.16.1 (24 June 2012)
 * fix command-line utilities compilation with Qt only
 * fix command-line utilities compilation on Windows
 * remove icd3 since it is far from ready
+* fix pinout for 10F2XX devices [reported by Junya Keller]
 
 0.16.0 (3 June 2012)
 * port to KDE4

Added: trunk/piklab_kde4/piklab_qt4.kdev4
===================================================================
--- trunk/piklab_kde4/piklab_qt4.kdev4	                        (rev 0)
+++ trunk/piklab_kde4/piklab_qt4.kdev4	2012-06-24 18:54:36 UTC (rev 2918)
@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevCMakeManager
+Name=piklab_qt4

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -58,19 +58,19 @@
     <pin index="2" name="VDD"             />
     <pin index="3" name="GP2/T0CKI/FOSC4" />
     <pin index="4" name="GP1/ICSPCLK"     />
-    <pin index="5" name="GP3/MCLR/VPP"    />
-    <pin index="6" name="VSS"             />
-    <pin index="7" name="N/C"             />
-    <pin index="8" name="GP0/ISCPDAT"     />
+    <pin index="5" name="GP0/ISCPDAT"     />
+    <pin index="6" name="N/C"             />
+    <pin index="7" name="VSS"             />
+    <pin index="8" name="GP3/MCLR/VPP"    />
   </package>
 
   <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
+    <pin index="1" name="GP0/ISCPDAT"     />
+    <pin index="2" name="VSS"             />
+    <pin index="3" name="GP1/ICSPCLK"     />
+    <pin index="4" name="GP2/T0CKI/FOSC4" />
+    <pin index="5" name="VDD"             />
+    <pin index="6" name="GP3/MCLR/VPP"    />
   </package>
 
 </device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -16,7 +16,7 @@
     <checksum protected="Off"     bchecksum="0xEE1D" cchecksum="0xDC65" />
     <checksum protected="040:1FE" bchecksum="0xEDF1" cchecksum="0xD35D" />
   </checksums>
-  
+
 <!--* Operating characteristics ********************************************-->
   <frequency_range name="extended" >
     <frequency start="4" end="4" vdd_min="2" vdd_max="5.5" />
@@ -53,24 +53,24 @@
   </config>
 
 <!--* Packages *************************************************************-->
-  <package types="pdip"  nb_pins="8" >
-    <pin index="1" name="N/C"             />
-    <pin index="2" name="VDD"             />
-    <pin index="3" name="GP2/T0CKI/FOSC4" />
-    <pin index="4" name="GP1/ICSPCLK"     />
-    <pin index="5" name="GP3/MCLR/VPP"    />
-    <pin index="6" name="VSS"             />
-    <pin index="7" name="N/C"             />
-    <pin index="8" name="GP0/ISCPDAT"     />
-  </package>
+<package types="pdip"  nb_pins="8" >
+  <pin index="1" name="N/C"             />
+  <pin index="2" name="VDD"             />
+  <pin index="3" name="GP2/T0CKI/FOSC4" />
+  <pin index="4" name="GP1/ICSPCLK"     />
+  <pin index="5" name="GP0/ISCPDAT"     />
+  <pin index="6" name="N/C"             />
+  <pin index="7" name="VSS"             />
+  <pin index="8" name="GP3/MCLR/VPP"    />
+</package>
 
-  <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
-  </package>
+ <package types="sot23" nb_pins="6" >
+   <pin index="1" name="GP0/ISCPDAT"     />
+   <pin index="2" name="VSS"             />
+   <pin index="3" name="GP1/ICSPCLK"     />
+   <pin index="4" name="GP2/T0CKI/FOSC4" />
+   <pin index="5" name="VDD"             />
+   <pin index="6" name="GP3/MCLR/VPP"    />
+ </package>
 
 </device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -58,19 +58,19 @@
     <pin index="2" name="VDD"                  />
     <pin index="3" name="GP2/T0CKI/FOSC4/COUT" />
     <pin index="4" name="GP1/ISCPCLK/CIN-"     />
-    <pin index="5" name="GP3/MCLR/VPP"         />
-    <pin index="6" name="VSS"                  />
-    <pin index="7" name="N/C"                  />
-    <pin index="8" name="GP0/ISCPDAT/CIN+"     />
+    <pin index="5" name="GP0/ISCPDAT/CIN+"     />
+    <pin index="6" name="N/C"                  />
+    <pin index="7" name="VSS"                  />
+    <pin index="8" name="GP3/MCLR/VPP"         />
   </package>
 
   <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
+    <pin index="1" name="GP0/ISCPDAT/CIN+"     />
+    <pin index="2" name="VSS"                  />
+    <pin index="3" name="GP1/ISCPCLK/CIN-"     />
+    <pin index="4" name="GP2/T0CKI/FOSC4/COUT" />
+    <pin index="5" name="VDD"                  />
+    <pin index="6" name="GP3/MCLR/VPP"         />
   </package>
 
 </device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -53,24 +53,24 @@
   </config>
 
 <!--* Packages *************************************************************-->
-  <package types="pdip"  nb_pins="8" >
-    <pin index="1" name="N/C"                  />
-    <pin index="2" name="VDD"                  />
-    <pin index="3" name="GP2/T0CKI/FOSC4/COUT" />
-    <pin index="4" name="GP1/ISCPCLK/CIN-"     />
-    <pin index="5" name="GP3/MCLR/VPP"         />
-    <pin index="6" name="VSS"                  />
-    <pin index="7" name="N/C"                  />
-    <pin index="8" name="GP0/ISCPDAT/CIN+"     />
-  </package>
+<package types="pdip"  nb_pins="8" >
+  <pin index="1" name="N/C"                  />
+  <pin index="2" name="VDD"                  />
+  <pin index="3" name="GP2/T0CKI/FOSC4/COUT" />
+  <pin index="4" name="GP1/ISCPCLK/CIN-"     />
+  <pin index="5" name="GP0/ISCPDAT/CIN+"     />
+  <pin index="6" name="N/C"                  />
+  <pin index="7" name="VSS"                  />
+  <pin index="8" name="GP3/MCLR/VPP"         />
+</package>
 
-  <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
-  </package>
+ <package types="sot23" nb_pins="6" >
+   <pin index="1" name="GP0/ISCPDAT/CIN+"     />
+   <pin index="2" name="VSS"                  />
+   <pin index="3" name="GP1/ISCPCLK/CIN-"     />
+   <pin index="4" name="GP2/T0CKI/FOSC4/COUT" />
+   <pin index="5" name="VDD"                  />
+   <pin index="6" name="GP3/MCLR/VPP"         />
+ </package>
 
 </device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -7,10 +7,13 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F220" document="023673" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
+<device name="10F220" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
+<!--* Documents ************************************************************-->
+  <documents webpage="023673" datasheet="41270" progsheet="41266" erratas="80271 80412" />
+
 <!--* Checksums ************************************************************-->
   <checksums>
     <checksum protected="Off"     bchecksum="0xEF20" cchecksum="0xDD68" />
@@ -63,19 +66,19 @@
     <pin index="2" name="VDD"             />
     <pin index="3" name="GP2/T0CKI/FOSC4" />
     <pin index="4" name="GP1/ISCPCLK/AN1" />
-    <pin index="5" name="GP3/MCLR/VPP"    />
-    <pin index="6" name="VSS"             />
-    <pin index="7" name="N/C"             />
-    <pin index="8" name="GP0/ISCPDAT/AN0" />
+    <pin index="5" name="GP0/ISCPDAT/AN0" />
+    <pin index="6" name="N/C"             />
+    <pin index="7" name="VSS"             />
+    <pin index="8" name="GP3/MCLR/VPP"    />
   </package>
 
   <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
+    <pin index="1" name="GP0/ISCPDAT/AN0" />
+    <pin index="2" name="VSS"             />
+    <pin index="3" name="GP1/ISCPCLK/AN1" />
+    <pin index="4" name="GP2/T0CKI/FOSC4" />
+    <pin index="5" name="VDD"             />
+    <pin index="6" name="GP3/MCLR/VPP"    />
   </package>
 
 </device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml	2012-06-24 18:48:55 UTC (rev 2917)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml	2012-06-24 18:54:36 UTC (rev 2918)
@@ -7,10 +7,13 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F222" document="023672" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
+<device name="10F222" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
+<!--* Documents ************************************************************-->
+  <documents webpage="023672" datasheet="41270" progsheet="41266" erratas="80271 80412" />
+
 <!--* Checksums ************************************************************-->
   <checksums>
     <checksum protected="Off"     bchecksum="0xEE20" cchecksum="0xDC68" />
@@ -58,24 +61,24 @@
   </config>
 
 <!--* Packages *************************************************************-->
-  <package types="pdip"  nb_pins="8" >
-    <pin index="1" name="N/C"             />
-    <pin index="2" name="VDD"             />
-    <pin index="3" name="GP2/T0CKI/FOSC4" />
-    <pin index="4" name="GP1/ISCPCLK/AN1" />
-    <pin index="5" name="GP3/MCLR/VPP"    />
-    <pin index="6" name="VSS"             />
-    <pin index="7" name="N/C"             />
-    <pin index="8" name="GP0/ISCPDAT/AN0" />
-  </package>
+<package types="pdip"  nb_pins="8" >
+  <pin index="1" name="N/C"             />
+  <pin index="2" name="VDD"             />
+  <pin index="3" name="GP2/T0CKI/FOSC4" />
+  <pin index="4" name="GP1/ISCPCLK/AN1" />
+  <pin index="5" name="GP0/ISCPDAT/AN0" />
+  <pin index="6" name="N/C"             />
+  <pin index="7" name="VSS"             />
+  <pin index="8" name="GP3/MCLR/VPP"    />
+</package>
 
-  <package types="sot23" nb_pins="6" >
-    <pin index="1" name="" />
-    <pin index="2" name="" />
-    <pin index="3" name="" />
-    <pin index="4" name="" />
-    <pin index="5" name="" />
-    <pin index="6" name="" />
-  </package>
+ <package types="sot23" nb_pins="6" >
+   <pin index="1" name="GP0/ISCPDAT/AN0" />
+   <pin index="2" name="VSS"             />
+   <pin index="3" name="GP1/ISCPCLK/AN1" />
+   <pin index="4" name="GP2/T0CKI/FOSC4" />
+   <pin index="5" name="VDD"             />
+   <pin index="6" name="GP3/MCLR/VPP"    />
+   </package>
 
 </device>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2917] trunk/piklab_kde4

From: <az...@us...> - 2012-06-24 18:49:01

Revision: 2917
          http://piklab.svn.sourceforge.net/piklab/?rev=2917&view=rev
Author:   azhyd
Date:     2012-06-24 18:48:55 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
fix command-line utilities compilation on Windows

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/piklab.kdev4
    trunk/piklab_kde4/src/common/port/usb_port.cpp

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/Changelog	2012-06-24 18:48:55 UTC (rev 2917)
@@ -1,5 +1,6 @@
-0.16.1 (9 June 2012)
-* compile command-line utilities with Qt only
+0.16.1 (11 June 2012)
+* fix command-line utilities compilation with Qt only
+* fix command-line utilities compilation on Windows
 * remove icd3 since it is far from ready
 
 0.16.0 (3 June 2012)

Modified: trunk/piklab_kde4/piklab.kdev4
===================================================================
--- trunk/piklab_kde4/piklab.kdev4	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/piklab.kdev4	2012-06-24 18:48:55 UTC (rev 2917)
@@ -1,3 +1,3 @@
 [Project]
 Manager=KDevCMakeManager
-Name=piklab_qt4
+Name=piklab_kde4

Modified: trunk/piklab_kde4/src/common/port/usb_port.cpp
===================================================================
--- trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-12 04:48:11 UTC (rev 2916)
+++ trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-24 18:48:55 UTC (rev 2917)
@@ -73,7 +73,7 @@
 {
   initialize();
 #ifdef HAVE_USB
-  int configuration = -1, interface = -1, altsetting = -1, bulk_endpoint = -1;
+  int bulk_endpoint = -1;
   // walk through the possible configs, etc.
   qDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations);
   for (int c=0; c<dev->descriptor.bNumConfigurations; c++) {
@@ -91,9 +91,6 @@
           case 1: s += "(Isochronous) "; break;
           case 2: s += "(Bulk) ";
             /* Found the correct configuration, interface etc... it has bulk endpoints! */
-            configuration=c;
-            interface=i;
-            altsetting=a;
             break;
           case 3: s += "(Interrupt) "; break;
           default: s += "ERROR! Got an illegal value in endpoint bmAttributes";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2916] trunk/piklab_kde4

From: <az...@us...> - 2012-06-12 04:48:18

Revision: 2916
          http://piklab.svn.sourceforge.net/piklab/?rev=2916&view=rev
Author:   azhyd
Date:     2012-06-12 04:48:11 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
compile on windows

Modified Paths:
--------------
    trunk/piklab_kde4/CMakeLists.txt
    trunk/piklab_kde4/cmake/Piklab.cmake
    trunk/piklab_kde4/src/common/global/process_kde.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp
    trunk/piklab_kde4/src/common/port/usb_port.cpp

Modified: trunk/piklab_kde4/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/CMakeLists.txt	2012-06-12 02:22:57 UTC (rev 2915)
+++ trunk/piklab_kde4/CMakeLists.txt	2012-06-12 04:48:11 UTC (rev 2916)
@@ -6,7 +6,7 @@
   set(HAVE_USB 1)
   if (HAVE_USB)
     set(LIBUSB_VERSION "1.14.3")
-    set(LIBUSB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libusb-win32-device-bin-1.1.14.3)
+    set(LIBUSB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libusb-win32-bin-1.2.6.0)
   endif(HAVE_USB)
 endif(WIN32)
 

Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake	2012-06-12 02:22:57 UTC (rev 2915)
+++ trunk/piklab_kde4/cmake/Piklab.cmake	2012-06-12 04:48:11 UTC (rev 2916)
@@ -38,6 +38,9 @@
       message(FATAL_ERROR "Could not find usb path \"${LIBUSB_DIR}\"")
     endif()
     set(LIBUSB_INCLUDE_DIRS ${LIBUSB_DIR}/include)
+    if(NOT EXISTS "${LIBUSB_INCLUDE_DIRS}/usb.h")
+      add_definitions(-DLIBUSB_NEW_WIN32_HEADER)
+    endif()
     set(LIBUSB_LIBRARIES ${LIBUSB_DIR}/lib/gcc/libusb.a)
     include_directories(${LIBUSB_INCLUDE_DIRS})
   endif(HAVE_USB)

Modified: trunk/piklab_kde4/src/common/global/process_kde.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.cpp	2012-06-12 02:22:57 UTC (rev 2915)
+++ trunk/piklab_kde4/src/common/global/process_kde.cpp	2012-06-12 04:48:11 UTC (rev 2916)
@@ -9,8 +9,6 @@
 #include "process_kde.h"
 #include "process_kde.moc"
 
-#include <kprocess.h>
-
 //----------------------------------------------------------------------------
 Process::ProcessIO::ProcessIO(QObject *parent)
   : QObject(parent)

Modified: trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp	2012-06-12 02:22:57 UTC (rev 2915)
+++ trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp	2012-06-12 04:48:11 UTC (rev 2916)
@@ -37,6 +37,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#if defined(WIN32)
+#  include <winsock.h>
+#endif
 #include <QtCore/QDir>
 #include <QtCore/QMutableStringListIterator>
 #include <QtCore/QRegExp>
@@ -911,6 +914,9 @@
   if (url.host().isEmpty() || (url.host() == QLatin1String("localhost")))
      return true;
 
+#ifdef Q_WS_WIN
+  return true;
+#else
   char hostname[ 256 ];
   hostname[ 0 ] = '\0';
   if (!gethostname( hostname, 255 ))
@@ -920,6 +926,7 @@
      *p = tolower(*p);
 
   return (url.host() == QString::fromLatin1( hostname ));
+#endif
 }
 
 bool KUrl::isLocalFile() const

Modified: trunk/piklab_kde4/src/common/port/usb_port.cpp
===================================================================
--- trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-12 02:22:57 UTC (rev 2915)
+++ trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-06-12 04:48:11 UTC (rev 2916)
@@ -12,7 +12,11 @@
 #include "usb_port.h"
 
 #ifdef HAVE_USB
-# include <usb.h>
+#  ifdef LIBUSB_NEW_WIN32_HEADER
+#    include <lusb0_usb.h>
+#  else
+#    include <usb.h>
+#  endif
 #endif
 #include <qdatetime.h>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2915] trunk/piklab_kde4/src/common

From: <az...@us...> - 2012-06-12 02:23:04

Revision: 2915
          http://piklab.svn.sourceforge.net/piklab/?rev=2915&view=rev
Author:   azhyd
Date:     2012-06-12 02:22:57 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
fix qt-only compilation when no kde headers

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/global.h
    trunk/piklab_kde4/src/common/global/process_kde.h
    trunk/piklab_kde4/src/common/nokde/nokde_klocale.h

Modified: trunk/piklab_kde4/src/common/common/global.h
===================================================================
--- trunk/piklab_kde4/src/common/common/global.h	2012-06-10 19:38:21 UTC (rev 2914)
+++ trunk/piklab_kde4/src/common/common/global.h	2012-06-12 02:22:57 UTC (rev 2915)
@@ -58,6 +58,7 @@
 #  include <kconfig.h>
 #  include <kaboutdata.h>
 #  include <kurl.h>
+#  include <kprocess.h>
 
 #endif
 

Modified: trunk/piklab_kde4/src/common/global/process_kde.h
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.h	2012-06-10 19:38:21 UTC (rev 2914)
+++ trunk/piklab_kde4/src/common/global/process_kde.h	2012-06-12 02:22:57 UTC (rev 2915)
@@ -11,8 +11,6 @@
 
 #include "common/common/global.h"
 
-#include <kprocess.h>
-
 namespace Process
 {
 class Base;

Modified: trunk/piklab_kde4/src/common/nokde/nokde_klocale.h
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_klocale.h	2012-06-10 19:38:21 UTC (rev 2914)
+++ trunk/piklab_kde4/src/common/nokde/nokde_klocale.h	2012-06-12 02:22:57 UTC (rev 2915)
@@ -10,7 +10,6 @@
 #include <qtextstream.h>
 #include <qstring.h>
 #include <qurl.h>
-#include <kshell.h>
 
 class KLocale
 {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2914] trunk/piklab_kde4

From: <az...@us...> - 2012-06-10 19:38:27

Revision: 2914
          http://piklab.svn.sourceforge.net/piklab/?rev=2914&view=rev
Author:   azhyd
Date:     2012-06-10 19:38:21 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
remove icd3 from release

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/progs/list/prog_list_noui.cpp

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-06-10 18:27:31 UTC (rev 2913)
+++ trunk/piklab_kde4/Changelog	2012-06-10 19:38:21 UTC (rev 2914)
@@ -1,5 +1,6 @@
 0.16.1 (9 June 2012)
 * compile command-line utilities with Qt only
+* remove icd3 since it is far from ready
 
 0.16.0 (3 June 2012)
 * port to KDE4

Modified: trunk/piklab_kde4/src/progs/list/prog_list_noui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/list/prog_list_noui.cpp	2012-06-10 18:27:31 UTC (rev 2913)
+++ trunk/piklab_kde4/src/progs/list/prog_list_noui.cpp	2012-06-10 19:38:21 UTC (rev 2914)
@@ -12,7 +12,7 @@
 #include "progs/icd2/base/icd2_prog.h"
 #include "progs/icd2/base/icd2_debug.h"
 #include "progs/icd1/base/icd1_prog.h"
-#include "progs/icd3/base/icd3_prog.h"
+//#include "progs/icd3/base/icd3_prog.h"
 #include "progs/pickit2/base/pickit2_prog.h"
 #include "progs/pickit1/base/pickit1_prog.h"
 #include "progs/psp/base/psp_prog.h"
@@ -29,7 +29,7 @@
   addGroup(new Icd2::ProgrammerGroup, 0);
   addGroup(new Icd2::DebuggerGroup, 0);
   addGroup(new Icd1::Group, 0);
-  addGroup(new Icd3::ProgrammerGroup, 0);
+  //addGroup(new Icd3::ProgrammerGroup, 0);
   addGroup(new Pickit2::Group, 0);
   //addGroup(new Pickit2V2::Group, 0);
   addGroup(new Pickit1::Group, 0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2913] trunk/piklab_kde4/src/common

From: <az...@us...> - 2012-06-10 18:27:37

Revision: 2913
          http://piklab.svn.sourceforge.net/piklab/?rev=2913&view=rev
Author:   azhyd
Date:     2012-06-10 18:27:31 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
fix for qt-only

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/global/pfile.cpp
    trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
    trunk/piklab_kde4/src/common/kde/kde_purl.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp

Modified: trunk/piklab_kde4/src/common/global/pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/global/pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -94,3 +94,42 @@
   close();
   _url = url;
 }
+
+//-----------------------------------------------------------------------------
+PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
+: FileBase(log, extension)
+{}
+
+PURL::Url PURL::TempFile::url() const
+{
+  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
+}
+
+bool PURL::TempFile::close()
+{
+  _stream.reset(NULL);
+  if (_tmp.get() != NULL) {
+    _tmp->close();
+  }
+  return true;
+}
+
+bool PURL::TempFile::openForWrite()
+{
+  close();
+  _tmp.reset(new KTemporaryFile);
+#if defined(NO_KDE)
+  _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
+  _tmp->setAutoRemove(true);
+#else
+  if (!_extension.isEmpty()) {
+    _tmp->setSuffix("." + _extension);
+  }
+#endif
+  if (!_tmp->open()) {
+    _error = i18n("Could not create temporary file.");
+    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+    return false;
+  }
+  return true;
+}

Modified: trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -74,37 +74,3 @@
   if ( !_url.isEmpty() ) return _url.del(_log);
   return false;
 }
-
-//-----------------------------------------------------------------------------
-PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
-  : FileBase(log, extension)
-{}
-
-PURL::Url PURL::TempFile::url() const
-{
-  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
-}
-
-bool PURL::TempFile::close()
-{
-  _stream.reset(NULL);
-  if (_tmp.get() != NULL) {
-    _tmp->close();
-  }
-  return true;
-}
-
-bool PURL::TempFile::openForWrite()
-{
-  close();
-  _tmp.reset(new KTemporaryFile);
-  if (!_extension.isEmpty()) {
-    _tmp->setSuffix("." + _extension);
-  }
-  if (!_tmp->open()) {
-    _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-    return false;
-  }
-  return true;
-}

Modified: trunk/piklab_kde4/src/common/kde/kde_purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -25,7 +25,7 @@
 
 bool PURL::Url::create(Log::Generic &log) const
 {
-  // assume file do no exist if ioslave cannot tell...
+  // assume file does not exist if ioslave cannot tell...
   if ( KIO::NetAccess::exists(_url, KIO::NetAccess::DestinationSide, qApp->mainWidget()) ) return false;
   KTemporaryFile tmp;
   if (!tmp.open()) return false;

Modified: trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -45,41 +45,3 @@
 {
   return _file->remove();
 }
-
-//-----------------------------------------------------------------------------
-PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
-  : FileBase(log, extension)
-{}
-
-PURL::Url PURL::TempFile::url() const
-{
-  return (_tmp.get() != NULL ? fromPathOrUrl(_tmp->name(), false) : Url());
-}
-
-bool PURL::TempFile::close()
-{
-  _stream.reset(NULL);
-  if (_tmp.get() != NULL) {
-    _tmp->close();
-    if ( _tmp->status()!=IO_Ok ) {
-      _error = i18n("Could not write to temporary file.");
-      _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-      return false;
-    }
-  }
-  return true;
-}
-
-bool PURL::TempFile::openForWrite()
-{
-  close();
-  _tmp.reset(new QTemporaryFile);
-   _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
-  _tmp->setAutoRemove(true);
-  if ( _tmp->status()!=0 ) {
-    _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-    return false;
-  }
-  return true;
-}

Modified: trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp	2012-06-10 00:58:40 UTC (rev 2912)
+++ trunk/piklab_kde4/src/common/nokde/nokde_purl.cpp	2012-06-10 18:27:31 UTC (rev 2913)
@@ -35,7 +35,7 @@
   // do not overwrite
   QFile file(filepath());
   if (file.exists()) {
-    return true;
+    return false;
   }
   bool ok = file.open(QIODevice::WriteOnly);
   if (!ok) log.sorry(i18n("Could not create file"), pretty());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2912] trunk/dev_utils

From: <az...@us...> - 2012-06-10 00:58:47

Revision: 2912
          http://piklab.svn.sourceforge.net/piklab/?rev=2912&view=rev
Author:   azhyd
Date:     2012-06-10 00:58:40 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
make dev_utils compile with kde4

Modified Paths:
--------------
    trunk/dev_utils/CMakeLists.txt
    trunk/dev_utils/src/CMakeLists.txt
    trunk/dev_utils/src/dev_config_check.cpp
    trunk/dev_utils/src/dev_parser/CMakeLists.txt
    trunk/dev_utils/src/dev_parser/dev_parser.cpp
    trunk/dev_utils/src/dev_parser/dev_parser.h
    trunk/dev_utils/src/html_generator.cpp
    trunk/dev_utils/src/html_generator.h
    trunk/dev_utils/src/inc_parser.cpp
    trunk/dev_utils/src/list_generator.cpp
    trunk/dev_utils/src/main_generator.cpp
    trunk/dev_utils/src/pickit2_to_data.cpp
    trunk/dev_utils/src/picp_check/CMakeLists.txt
    trunk/dev_utils/src/reg_extractor.cpp
    trunk/dev_utils/src/usb_snoop_filter.cpp
    trunk/dev_utils/src/usbmon_filter.cpp

Modified: trunk/dev_utils/CMakeLists.txt
===================================================================
--- trunk/dev_utils/CMakeLists.txt	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/CMakeLists.txt	2012-06-10 00:58:40 UTC (rev 2912)
@@ -1,7 +1,7 @@
 # adapt the two follwing lines to point to piklab source directory
 # and to piklab build directory
-set(PIKLAB_SRCDIR ${CMAKE_CURRENT_BINARY_DIR}/../piklab/src)
-set(PIKLAB_BINDIR ${CMAKE_CURRENT_BINARY_DIR}/../piklab/build)
+set(PIKLAB_SRCDIR ${CMAKE_CURRENT_BINARY_DIR}/../../piklab/src)
+set(PIKLAB_BINDIR ${CMAKE_CURRENT_BINARY_DIR}/../../piklab/build)
 
 cmake_minimum_required(VERSION 2.4)
 if(COMMAND cmake_policy)
@@ -11,117 +11,130 @@
 set(CMAKE_BUILD_TYPE Debug)
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../piklab/cmake)
 
-find_package(KDE3 REQUIRED)
-add_definitions(${QT_DEFINITIONS} ${KDE3_DEFINITIONS})
-link_directories(${KDE3_LIB_DIR})
-include_directories(${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-set(GUI_LIBS ${QT_AND_KDECORE_LIBS} kio)
+find_package(Qt4 REQUIRED)
+set(QT_USE_QTXML 1)
+set(QT_USE_QT3SUPPORT 1)
+set(QT_USE_QTTEST 1)
+include(${QT_USE_FILE})
 
+macro(automoc)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+qt4_automoc(${ARGV})
+endmacro(automoc)
+
+find_package(LIBUSB REQUIRED)
+include_directories(${LIBUSB_INCLUDE_DIRS})
+
+find_package(KDE4 REQUIRED)
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+include_directories( ${KDE4_INCLUDE_DIRS})
+set(EXE_LIBS ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBUSB_LIBRARIES})
+set(GUI_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${EXE_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS})
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
 include_directories(${PIKLAB_SRCDIR})
 include_directories(${PIKLAB_BINDIR})
 
-set(BASE_LIBS ${PIKLAB_BINDIR}/src/devices/mem24/prog/libmem24prog.a
-              ${PIKLAB_BINDIR}/src/devices/pic/prog/libpicprog.a
-              ${PIKLAB_BINDIR}/src/progs/base/libprogbase.a
+set(BASE_LIBS ${PIKLAB_BINDIR}/lib/libmem24prog.a
+              ${PIKLAB_BINDIR}/lib/libpicprog.a
+              ${PIKLAB_BINDIR}/lib/libprogbase.a
 
-              ${PIKLAB_BINDIR}/src/common/port/libport.a
-              ${PIKLAB_BINDIR}/src/common/cli/libcli.a
-              ${PIKLAB_BINDIR}/src/common/kde/libkde.a
-              ${PIKLAB_BINDIR}/src/common/global/libglobal.a
+              ${PIKLAB_BINDIR}/lib/libport.a
+              ${PIKLAB_BINDIR}/lib/libcli.a
+              ${PIKLAB_BINDIR}/lib/libkde.a
+              ${PIKLAB_BINDIR}/lib/libglobal.a
 
-              ${PIKLAB_BINDIR}/src/devices/pic/pic/libpic.a
-              ${PIKLAB_BINDIR}/src/devices/mem24/mem24/libmem24.a
-              ${PIKLAB_BINDIR}/src/devices/pic/xml_data/libpicxml.a
-              ${PIKLAB_BINDIR}/src/devices/mem24/xml_data/libmem24xml.a
-              ${PIKLAB_BINDIR}/src/devices/pic/base/libpicbase.a
-              ${PIKLAB_BINDIR}/src/devices/mem24/base/libmem24base.a
-              ${PIKLAB_BINDIR}/src/devices/base/libdevicebase.a
+              ${PIKLAB_BINDIR}/lib/libpic.a
+              ${PIKLAB_BINDIR}/lib/libmem24.a
+              ${PIKLAB_BINDIR}/lib/libpicxml.a
+              ${PIKLAB_BINDIR}/lib/libmem24xml.a
+              ${PIKLAB_BINDIR}/lib/libpicbase.a
+              ${PIKLAB_BINDIR}/lib/libmem24base.a
+              ${PIKLAB_BINDIR}/lib/libdevicebase.a
 
-              ${PIKLAB_BINDIR}/src/common/common/libcommon.a
+              ${PIKLAB_BINDIR}/lib/libcommon.a
 )
 
-set(ALL_LIBS ${PIKLAB_BINDIR}/src/libgui/libgui.a
+set(ALL_LIBS ${PIKLAB_BINDIR}/lib/libgui.a
 
-             ${PIKLAB_BINDIR}/src/tools/list/libtoollist.a
-             ${PIKLAB_BINDIR}/src/tools/cc5x/gui/libcc5xui.a
-             ${PIKLAB_BINDIR}/src/tools/mpc/gui/libmpcui.a
-             ${PIKLAB_BINDIR}/src/tools/boost/gui/libboostui.a
-             ${PIKLAB_BINDIR}/src/tools/jalv2/gui/libjalv2ui.a
-             ${PIKLAB_BINDIR}/src/tools/ccsc/gui/libccscui.a
-             ${PIKLAB_BINDIR}/src/tools/c18/gui/libc18ui.a
-             ${PIKLAB_BINDIR}/src/tools/jal/gui/libjalui.a
-             ${PIKLAB_BINDIR}/src/tools/pic30/gui/libpic30ui.a
-             ${PIKLAB_BINDIR}/src/tools/picc/gui/libpiccui.a
-             ${PIKLAB_BINDIR}/src/tools/sdcc/gui/libsdccui.a
-             ${PIKLAB_BINDIR}/src/tools/gputils/gui/libgputilsui.a
+             ${PIKLAB_BINDIR}/lib/libtoollist.a
+             ${PIKLAB_BINDIR}/lib/libcc5xui.a
+             ${PIKLAB_BINDIR}/lib/libmpcui.a
+             ${PIKLAB_BINDIR}/lib/libboostui.a
+             ${PIKLAB_BINDIR}/lib/libjalv2ui.a
+             ${PIKLAB_BINDIR}/lib/libccscui.a
+             ${PIKLAB_BINDIR}/lib/libc18ui.a
+             ${PIKLAB_BINDIR}/lib/libjalui.a
+             ${PIKLAB_BINDIR}/lib/libpic30ui.a
+             ${PIKLAB_BINDIR}/lib/libpiccui.a
+             ${PIKLAB_BINDIR}/lib/libsdccui.a
+             ${PIKLAB_BINDIR}/lib/libgputilsui.a
 
-             ${PIKLAB_BINDIR}/src/tools/custom/libcustomtool.a
-             ${PIKLAB_BINDIR}/src/tools/cc5x/libcc5x.a
-             ${PIKLAB_BINDIR}/src/tools/mpc/libmpc.a
-             ${PIKLAB_BINDIR}/src/tools/boost/libboost.a
-             ${PIKLAB_BINDIR}/src/tools/jalv2/libjalv2.a
-             ${PIKLAB_BINDIR}/src/tools/ccsc/libccsc.a
-             ${PIKLAB_BINDIR}/src/tools/c18/libc18.a
-             ${PIKLAB_BINDIR}/src/tools/jal/libjal.a
-             ${PIKLAB_BINDIR}/src/tools/pic30/libpic30.a
-             ${PIKLAB_BINDIR}/src/tools/picc/libpicc.a
-             ${PIKLAB_BINDIR}/src/tools/sdcc/libsdcc.a
-             ${PIKLAB_BINDIR}/src/tools/gputils/libgputils.a
-             ${PIKLAB_BINDIR}/src/tools/gui/libtoolui.a
-             ${PIKLAB_BINDIR}/src/tools/base/libtoolbase.a
+             ${PIKLAB_BINDIR}/lib/libcustomtool.a
+             ${PIKLAB_BINDIR}/lib/libcc5x.a
+             ${PIKLAB_BINDIR}/lib/libmpc.a
+             ${PIKLAB_BINDIR}/lib/libboost.a
+             ${PIKLAB_BINDIR}/lib/libjalv2.a
+             ${PIKLAB_BINDIR}/lib/libccsc.a
+             ${PIKLAB_BINDIR}/lib/libc18.a
+             ${PIKLAB_BINDIR}/lib/libjal.a
+             ${PIKLAB_BINDIR}/lib/libpic30.a
+             ${PIKLAB_BINDIR}/lib/libpicc.a
+             ${PIKLAB_BINDIR}/lib/libsdcc.a
+             ${PIKLAB_BINDIR}/lib/libgputils.a
+             ${PIKLAB_BINDIR}/lib/libtoolui.a
+             ${PIKLAB_BINDIR}/lib/libtoolbase.a
 
-             ${PIKLAB_BINDIR}/src/progs/list/libproglistui.a
-             ${PIKLAB_BINDIR}/src/progs/custom/gui/libcustomprogui.a
-             ${PIKLAB_BINDIR}/src/progs/picdem_bootloader/gui/libpicdembootloaderui.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2_bootloader/gui/libpickit2bootloaderui.a
-             ${PIKLAB_BINDIR}/src/progs/tbl_bootloader/gui/libtblbootloaderui.a
-             ${PIKLAB_BINDIR}/src/progs/bootloader/gui/libbootloaderui.a
-             ${PIKLAB_BINDIR}/src/progs/gpsim/gui/libgpsimui.a
-             ${PIKLAB_BINDIR}/src/progs/psp/gui/libpspui.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2v2/gui/libpickit2v2ui.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2/gui/libpickit2ui.a
-             ${PIKLAB_BINDIR}/src/progs/pickit1/gui/libpickit1ui.a
-             ${PIKLAB_BINDIR}/src/progs/icd1/gui/libicd1ui.a
-             ${PIKLAB_BINDIR}/src/progs/icd2/gui/libicd2ui.a
-             ${PIKLAB_BINDIR}/src/progs/direct/gui/libdirectui.a
-             ${PIKLAB_BINDIR}/src/progs/gui/libprogui.a
+             ${PIKLAB_BINDIR}/lib/libproglistui.a
+             ${PIKLAB_BINDIR}/lib/libcustomprogui.a
+             ${PIKLAB_BINDIR}/lib/libpicdembootloaderui.a
+             ${PIKLAB_BINDIR}/lib/libpickit2bootloaderui.a
+             ${PIKLAB_BINDIR}/lib/libtblbootloaderui.a
+             ${PIKLAB_BINDIR}/lib/libbootloaderui.a
+             ${PIKLAB_BINDIR}/lib/libgpsimui.a
+             ${PIKLAB_BINDIR}/lib/libpspui.a
+             ${PIKLAB_BINDIR}/lib/libpickit2v2ui.a
+             ${PIKLAB_BINDIR}/lib/libpickit2ui.a
+             ${PIKLAB_BINDIR}/lib/libpickit1ui.a
+             ${PIKLAB_BINDIR}/lib/libicd1ui.a
+             ${PIKLAB_BINDIR}/lib/libicd2ui.a
+             ${PIKLAB_BINDIR}/lib/libdirectui.a
+             ${PIKLAB_BINDIR}/lib/libprogui.a
 
-             ${PIKLAB_BINDIR}/src/progs/custom/base/libcustomprog.a
-             ${PIKLAB_BINDIR}/src/progs/picdem_bootloader/base/libpicdembootloader.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2_bootloader/base/libpickit2bootloader.a
-             ${PIKLAB_BINDIR}/src/progs/tbl_bootloader/base/libtblbootloader.a
-             ${PIKLAB_BINDIR}/src/progs/bootloader/base/libbootloader.a
-             ${PIKLAB_BINDIR}/src/progs/gpsim/base/libgpsim.a
-             ${PIKLAB_BINDIR}/src/progs/psp/base/libpsp.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2v2/base/libpickit2v2.a
-             ${PIKLAB_BINDIR}/src/progs/pickit1/base/libpickit1.a
-             ${PIKLAB_BINDIR}/src/progs/pickit2/base/libpickit2.a
-             ${PIKLAB_BINDIR}/src/progs/icd1/base/libicd1.a
-             ${PIKLAB_BINDIR}/src/progs/icd2/base/libicd2.a
-             ${PIKLAB_BINDIR}/src/progs/icd2/icd2_data/libicd2data.a
-             ${PIKLAB_BINDIR}/src/progs/direct/base/libdirectprog.a
-             ${PIKLAB_BINDIR}/src/progs/manager/libprogmanager.a
-             ${PIKLAB_BINDIR}/src/devices/pic/prog/libpicprog.a
-             ${PIKLAB_BINDIR}/src/devices/mem24/prog/libmem24prog.a
-             ${PIKLAB_BINDIR}/src/progs/base/libprogbase.a
+             ${PIKLAB_BINDIR}/lib/libcustomprog.a
+             ${PIKLAB_BINDIR}/lib/libpicdembootloader.a
+             ${PIKLAB_BINDIR}/lib/libpickit2bootloader.a
+             ${PIKLAB_BINDIR}/lib/libtblbootloader.a
+             ${PIKLAB_BINDIR}/lib/libbootloader.a
+             ${PIKLAB_BINDIR}/lib/libgpsim.a
+             ${PIKLAB_BINDIR}/lib/libpsp.a
+             ${PIKLAB_BINDIR}/lib/libpickit2v2.a
+             ${PIKLAB_BINDIR}/lib/libpickit1.a
+             ${PIKLAB_BINDIR}/lib/libpickit2.a
+             ${PIKLAB_BINDIR}/lib/libicd1.a
+             ${PIKLAB_BINDIR}/lib/libicd2.a
+             ${PIKLAB_BINDIR}/lib/libicd2data.a
+             ${PIKLAB_BINDIR}/lib/libdirectprog.a
+             ${PIKLAB_BINDIR}/lib/libprogmanager.a
+             ${PIKLAB_BINDIR}/lib/libpicprog.a
+             ${PIKLAB_BINDIR}/lib/libmem24prog.a
+             ${PIKLAB_BINDIR}/lib/libprogbase.a
 
-             ${PIKLAB_BINDIR}/src/coff/base/libcoff.a
-             ${PIKLAB_BINDIR}/src/common/port/libport.a
-             ${PIKLAB_BINDIR}/src/common/global/libglobal.a
+             ${PIKLAB_BINDIR}/lib/libcoff.a
+             ${PIKLAB_BINDIR}/lib/libport.a
+             ${PIKLAB_BINDIR}/lib/libglobal.a
 
-             ${PIKLAB_BINDIR}/src/devices/list/libdevicelistui.a
-             ${PIKLAB_BINDIR}/src/devices/mem24/gui/libmem24ui.a
-             ${PIKLAB_BINDIR}/src/devices/pic/gui/libpicui.a
-             ${PIKLAB_BINDIR}/src/devices/gui/libdeviceui.a
-             ${PIKLAB_BINDIR}/src/common/gui/libcommonui.a
+             ${PIKLAB_BINDIR}/lib/libdevicelistui.a
+             ${PIKLAB_BINDIR}/lib/libmem24ui.a
+             ${PIKLAB_BINDIR}/lib/libpicui.a
+             ${PIKLAB_BINDIR}/lib/libdeviceui.a
+             ${PIKLAB_BINDIR}/lib/libkde_gui.a
+             ${PIKLAB_BINDIR}/lib/libcommonui.a
 
              ${BASE_LIBS}
 )
 
-find_package(LIBUSB REQUIRED)
-include_directories(${LIBUSB_INCLUDE_DIRS})
-
 add_subdirectory(src)

Modified: trunk/dev_utils/src/CMakeLists.txt
===================================================================
--- trunk/dev_utils/src/CMakeLists.txt	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/CMakeLists.txt	2012-06-10 00:58:40 UTC (rev 2912)
@@ -1,95 +1,83 @@
 add_subdirectory(dev_parser)
-add_subdirectory(picp_check)
+#add_subdirectory(picp_check)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 SET(pickit2_to_data_SRCS
    pickit2_to_data.cpp
 )
-kde3_automoc(${pickit2_to_data_SRCS})
-kde3_add_executable(pickit2_to_data ${pickit2_to_data_SRCS})
+automoc(${pickit2_to_data_SRCS})
+add_executable(pickit2_to_data ${pickit2_to_data_SRCS})
 target_link_libraries(pickit2_to_data ${GUI_LIBS}
-                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
+                      ${PIKLAB_BINDIR}/lib/libdevicelistnoui.a
                       ${BASE_LIBS})
 
-
 SET(usbmon_filter_SRCS
    usbmon_filter.cpp
 )
-kde3_automoc(${usbmon_filter_SRCS})
-kde3_add_executable(usbmon_filter ${usbmon_filter_SRCS})
-target_link_libraries(usbmon_filter ${GUI_LIBS}
-                      ${BASE_LIBS})
+automoc(${usbmon_filter_SRCS})
+add_executable(usbmon_filter ${usbmon_filter_SRCS})
+target_link_libraries(usbmon_filter ${GUI_LIBS} ${BASE_LIBS})
 
-
 SET(html_generator_SRCS
    html_generator.cpp
    main_generator.cpp
 )
-kde3_automoc(${html_generator_SRCS})
-kde3_add_executable(html_generator ${html_generator_SRCS})
-target_link_libraries(html_generator ${GUI_LIBS} ktexteditor khtml ${LIBUSB_LIBRARIES}
-                      ${ALL_LIBS})
+automoc(${html_generator_SRCS})
+add_executable(html_generator ${html_generator_SRCS})
+target_link_libraries(html_generator ${ALL_LIBS} ${GUI_LIBS})
 
-
 SET(reg_extractor_SRCS
    reg_extractor.cpp
 )
-kde3_automoc(${reg_extractor_SRCS})
-kde3_add_executable(reg_extractor ${reg_extractor_SRCS})
+automoc(${reg_extractor_SRCS})
+add_executable(reg_extractor ${reg_extractor_SRCS})
 target_link_libraries(reg_extractor ${GUI_LIBS}
                       devparser
-                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
+                      ${PIKLAB_BINDIR}/lib/libdevicelistnoui.a
                       ${BASE_LIBS})
 
-
 SET(config_check_SRCS
    dev_config_check.cpp
 )
-kde3_automoc(${config_check_SRCS})
-kde3_add_executable(config_check ${config_check_SRCS})
+automoc(${config_check_SRCS})
+add_executable(config_check ${config_check_SRCS})
 target_link_libraries(config_check ${GUI_LIBS}
                       devparser
-                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
+                      ${PIKLAB_BINDIR}/lib/libdevicelistnoui.a
                       ${BASE_LIBS})
 
-
 SET(inc_parser_SRCS
    inc_parser.cpp
 )
-kde3_automoc(${inc_parser_SRCS})
-kde3_add_executable(inc_parser ${inc_parser_SRCS})
+automoc(${inc_parser_SRCS})
+add_executable(inc_parser ${inc_parser_SRCS})
 target_link_libraries(inc_parser ${GUI_LIBS}
-                      ${PIKLAB_BINDIR}/src/coff/base/libcoff.a
-                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
+                      ${PIKLAB_BINDIR}/lib/libcoff.a
+                      ${PIKLAB_BINDIR}/lib/libdevicelistnoui.a
                       ${BASE_LIBS})
 
-
 SET(usb_snoop_filter_SRCS
    usb_snoop_filter.cpp
 )
-kde3_automoc(${usb_snoop_filter_SRCS})
-kde3_add_executable(usb_snoop_filter ${usb_snoop_filter_SRCS})
-target_link_libraries(usb_snoop_filter ${GUI_LIBS}
-                      ${PIKLAB_BINDIR}/src/common/common/libcommon.a)
+automoc(${usb_snoop_filter_SRCS})
+add_executable(usb_snoop_filter ${usb_snoop_filter_SRCS})
+target_link_libraries(usb_snoop_filter ${ALL_LIBS} ${GUI_LIBS})
 
-
 SET(list_generator_SRCS
    list_generator.cpp
    main_generator.cpp
 )
-kde3_automoc(${list_generator_SRCS})
-kde3_add_executable(list_generator ${list_generator_SRCS})
-target_link_libraries(list_generator ${GUI_LIBS} ktexteditor khtml ${LIBUSB_LIBRARIES}
-                      ${ALL_LIBS})
+automoc(${list_generator_SRCS})
+add_executable(list_generator ${list_generator_SRCS})
+target_link_libraries(list_generator ${ALL_LIBS} ${GUI_LIBS})
 
-
 #SET(gen_device_xml_SRCS
 #   gen_device_xml.cpp
 #)
-#kde3_automoc(${gen_device_xml_SRCS})
-#kde3_add_executable(gen_device_xml ${gen_device_xml_SRCS})
+#automoc(${gen_device_xml_SRCS})
+#add_executable(gen_device_xml ${gen_device_xml_SRCS})
 #target_link_libraries(gen_device_xml ${GUI_LIBS}
-#                      ${PIKLAB_BINDIR}/src/coff/base/libcoff.a
-#                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
+#                      ${PIKLAB_BINDIR}/lib/libcoff.a
+#                      ${PIKLAB_BINDIR}/lib/libdevicelistnoui.a
 #                      ${BASE_LIBS})

Modified: trunk/dev_utils/src/dev_config_check.cpp
===================================================================
--- trunk/dev_utils/src/dev_config_check.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/dev_config_check.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -58,7 +58,7 @@
   if ( !mem->attributes.contains("region") ) qFatal(QString("Memory range %1 presence does not match").arg(type.label()));
   Address start, end;
   extractRange(mem->attributes["region"], start, end);
-  if ( type==Pic::MemoryRangeType::Config && _data.architecture()==Pic::Architecture::P10X && start==end && start==0xFFF ) return; // dev contains hexfile offset (?)
+  if ( type==Pic::MemoryRangeType::Config && _data.architecture()==Pic::Architecture::Baseline && start==end && start==0xFFF ) return; // dev contains hexfile offset (?)
   if ( start!=_data.range(type).start ) qFatal(QString("Memory range %1 start does not match").arg(type.label()));
   if ( type==Pic::MemoryRangeType::DeviceId && _data.architecture()==Pic::Architecture::P30F ) end++; // #### not sure why...
   if ( type==Pic::MemoryRangeType::Code && _data.isPresent(Pic::MemoryRangeType::Cal) && _data.range(Pic::MemoryRangeType::Cal).start==_data.range(Pic::MemoryRangeType::Code).end+1 ) end--;
@@ -69,8 +69,9 @@
     BitValue id = _data.ids()[Device::Special::Normal];
     BitValue rid = fromHexLabel(mem->attributes["id"], NULL);
     switch (_data.architecture().type()) {
-      case Pic::Architecture::P10X:
-      case Pic::Architecture::P16X:
+      case Pic::Architecture::Baseline:
+      case Pic::Architecture::MidRange:
+      case Pic::Architecture::EMidRange:
       case Pic::Architecture::P17C:
         idmask = 0x3FE0;
         break;
@@ -200,19 +201,22 @@
 
 QStringList ConfigChecker::findDevConfigMask(const QString &xmask) const
 {
-  if ( _data.name().startsWith("17") && xmask=="WDTPS" ) return "WDT";
   QStringList list;
-  QString mask = xmask;
-  mask.replace('_', QString::null);
-  for (uint i=0; CONFIG_DATA[i].xmask; i++) {
-    if ( CONFIG_DATA[i].xmask!=mask ) continue;
-    if ( CONFIG_DATA[i].dmask!=0 ) list.append(CONFIG_DATA[i].dmask);
+  if ( _data.name().startsWith("17") && xmask=="WDTPS" ) {
+    list.append("WDT");
+  } else {
+    QString mask = xmask;
+    mask.replace('_', QString::null);
+    for (uint i=0; CONFIG_DATA[i].xmask; i++) {
+      if ( CONFIG_DATA[i].xmask!=mask ) continue;
+      if ( CONFIG_DATA[i].dmask!=0 ) list.append(CONFIG_DATA[i].dmask);
+    }
+    list.append(xmask);
+    list.append(mask);
+    if ( xmask=="CP" ) list.append("CP_0");
+    if ( xmask=="WRT" ) list.append("WRT_0");
+    if ( xmask=="EBTR" ) list.append("EBTR_0");
   }
-  list.append(xmask);
-  list.append(mask);
-  if ( xmask=="CP" ) list.append("CP_0");
-  if ( xmask=="WRT" ) list.append("WRT_0");
-  if ( xmask=="EBTR" ) list.append("EBTR_0");
   return list;
 }
 
@@ -235,26 +239,28 @@
 
   //uint cmask = _data.range(Device::MemoryConfig).mask;
   const Pic::Config &c = _data.config();
-  for (uint i=0; i<c._words.count(); i++) {
+  for (int i=0; i<c._words.count(); i++) {
     const Pic::Config::Word &w = c._words[i];
-    const Section *cw = findSection(_sections, "cfgbits", configName(i));
+    QStringList keys;
+    keys.append(configName(i));
+    const Section *cw = findSection(_sections, "cfgbits", keys);
     if ( cw==0 ) {
       if ( c._words[i].masks.count() ) qFatal(QString("Config %1 not present in .dev file").arg(configName(i)));
       continue;
     }
     //if ( fromHexLabel(cw->attributes["unused"], 0)!=(cmask & ~w.usedMask() ) ) qWarning(QString("Unused bits do not match in %1 (%2 - %3)").arg(w.name).arg(toHexLabel(cmask & ~w.usedMask(), 4)).arg(cw->attributes["unused"]));
-    for (uint k=0; k<w.masks.count(); k++) {
+    for (int k=0; k<w.masks.count(); k++) {
       const Pic::Config::Mask &m = w.masks[k];
       QStringList masks = findDevConfigMask(m.name);
       const Section *cm = findSection(cw->sections, "field", masks);
       if ( cm==0 ) qFatal(QString("Mask %1 does not exist in .dev file").arg(m.name));
       // #### TODO
     }
-    for (uint k=0; k<cw->sections.count(); k++) {
+    for (int k=0; k<cw->sections.count(); k++) {
       if ( cw->sections[k].name!="field" ) continue;
       if ( cw->sections[k].attributes["flags"].find("h")!=-1 ) continue;
       bool in = false;
-      for (uint l=0; l<w.masks.count(); l++) {
+      for (int l=0; l<w.masks.count(); l++) {
         QStringList masks = findDevConfigMask(w.masks[l].name);
         if ( masks.find(cw->sections[k].attributes["key"])==masks.end() ) continue;
         in = true;
@@ -263,10 +269,10 @@
       if ( !in ) qFatal(QString("Mask %1 does not exist in xml file").arg(cw->sections[k].attributes["key"]));
     }
   }
-  for (uint i=0; i<_sections.count(); i++) {
+  for (int i=0; i<_sections.count(); i++) {
     if ( _sections[i].name!="cfgbits" ) continue;
     bool in = false;
-    for (uint k=0; k<c._words.count(); k++) {
+    for (int k=0; k<c._words.count(); k++) {
       QStringList masks = findDevConfigMask(configName(k));
       if ( masks.find(_sections[i].attributes["key"])==masks.end() ) continue;
       in = true;
@@ -283,7 +289,7 @@
   DevParser::loopFiles(argc, argv, devices);
 
   QStringList all = Device::Lister::instance().supportedDevices();
-  for (uint i=0; i<all.count(); i++)
+  for (int i=0; i<all.count(); i++)
     if ( devices.find(all[i])==devices.end() ) qFatal("Device \"%s\" not in any .dev file.", all[i].latin1());
 
   return 0;

Modified: trunk/dev_utils/src/dev_parser/CMakeLists.txt
===================================================================
--- trunk/dev_utils/src/dev_parser/CMakeLists.txt	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/dev_parser/CMakeLists.txt	2012-06-10 00:58:40 UTC (rev 2912)
@@ -3,5 +3,6 @@
 SET(devparser_STAT_SRCS
    dev_parser.cpp
 )
-kde3_automoc(${devparser_STAT_SRCS})
+automoc(${devparser_STAT_SRCS})
+
 add_library(devparser STATIC ${devparser_STAT_SRCS})

Modified: trunk/dev_utils/src/dev_parser/dev_parser.cpp
===================================================================
--- trunk/dev_utils/src/dev_parser/dev_parser.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/dev_parser/dev_parser.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -35,7 +35,7 @@
   if ( !reg.exactMatch(todo) ) { // attribute with no value ?
     reg.setPattern("([\\w-]+).*");
     if ( !reg.exactMatch(todo) ) qFatal(QString("Could not recognize attribute: \"%1\"").arg(todo));
-    uint end = reg.cap(1).length();
+    int end = reg.cap(1).length();
     if ( end==todo.length() ) todo = QString::null;
     else {
       if ( todo[end]!=' ' ) qFatal(QString("Error parsing for attribute: \"%1\"").arg(todo));
@@ -111,7 +111,7 @@
 const DevParser::Section *DevParser::findUniqueSection(const QString &name) const
 {
   int k = -1;
-  for (uint i=0; i<_sections.count(); i++) {
+  for (int i=0; i<_sections.count(); i++) {
     if ( _sections[i].name!=name ) continue;
     if ( k!=-1 ) qWarning(QString("Section \"%1\" duplicated").arg(name));
     k = i;
@@ -120,11 +120,11 @@
   return &_sections[k];
 }
 
-const DevParser::Section *DevParser::findSection(const QValueVector<Section> &sections,
+const DevParser::Section *DevParser::findSection(const QVector<Section> &sections,
                                                  const QString &name, const QStringList &keys) const
 {
   int k = -1;
-  for (uint i=0; i<sections.count(); i++) {
+  for (int i=0; i<sections.count(); i++) {
     if ( sections[i].name!=name || keys.find(sections[i].attributes["key"])==keys.end() ) continue;
     if ( k!=-1 ) qWarning(QString("Section \"%1\" with keys \"%2\" duplicated").arg(name).arg(keys.join("/")));
     k = i;

Modified: trunk/dev_utils/src/dev_parser/dev_parser.h
===================================================================
--- trunk/dev_utils/src/dev_parser/dev_parser.h	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/dev_parser/dev_parser.h	2012-06-10 00:58:40 UTC (rev 2912)
@@ -11,7 +11,7 @@
 
 #include <qstringlist.h>
 #include <qmap.h>
-#include <qvaluevector.h>
+#include <qvector.h>
 #include "common/common/bitvalue.h"
 
 #include "common/common/bitvalue.h"
@@ -35,16 +35,16 @@
     QString name;
     QStringList unamedAttributes;
     QMap<QString, QString> attributes;
-    QValueVector<Section> sections;
+    QVector<Section> sections;
   };
-  QValueVector<Section>  _sections;
+  QVector<Section>  _sections;
   QMap<QString, QString> _fields;
 
   Section parseSection(QStringList::const_iterator &it,
                        const QStringList::const_iterator &end, uint nbTabs) const;
   QString parseAttribute(QString &todo, QString &value) const;
   const Section *findUniqueSection(const QString &name) const;
-  const Section *findSection(const QValueVector<Section> &sections,
+  const Section *findSection(const QVector<Section> &sections,
                              const QString &name, const QStringList &keys) const;
   void extractRange(const QString &s, Address &start, Address &end) const;
 

Modified: trunk/dev_utils/src/html_generator.cpp
===================================================================
--- trunk/dev_utils/src/html_generator.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/html_generator.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -23,17 +23,22 @@
 #include "tools/list/device_info.h"
 
 //----------------------------------------------------------------------------
-void MimeSourceFactory::setPixmap(const QString &name, const QPixmap &pixmap)
+void writePixmap(const QDir& dir, const QString& name, const QPixmap& pixmap)
 {
-  QMimeSourceFactory::setPixmap(name, pixmap);
-  _names.append(name);
+  if (pixmap.isNull()) return;
+  QImage image = pixmap.toImage();
+  QString filepath = dir.filePath(name);
+  QImage old;
+  if ( !old.load(filepath) || old!=image ) {
+    qDebug("  add image %s", name.latin1());
+    if ( !image.save(filepath, "PNG") ) qFatal("Could not write \"%s\".", filepath.latin1());
+  }
 }
 
-//----------------------------------------------------------------------------
 int function(const QDir &dir)
 {
   QStringList devices = Device::Lister::instance().supportedDevices();
-  for (uint i=0; i<devices.count(); i++) {
+  for (int i=0; i<devices.count(); i++) {
     // html file
     QFile file(dir.filePath(devices[i] + ".htm"));
     qDebug("%s", file.name().latin1());
@@ -41,30 +46,25 @@
     QTextStream fs(&file);
     const Device::Data *data = Device::Lister::instance().data(devices[i]);
     Q_ASSERT(data);
-    MimeSourceFactory msf;
-    QMimeSourceFactory::setDefaultFactory(&msf);
     fs << "<table><tr><td>";
     QString s = htmlTableRow("Information:", Device::webpageHtml(*data));
     fs << Device::htmlInfo(*data, "devices.php?device=%1", s);
     fs << Device::supportedHtmlInfo(*data);
     fs << "<hr />\n";
-    fs << Device::htmlVoltageFrequencyGraphs(*data, "devices/", &msf);
+    fs << Device::voltageFrequencyHtml(*data, "devices/");
     fs << "</td><td valign=\"top\">";
-    fs << Device::htmlPinDiagrams(*data, "devices/", &msf);
+    fs << Device::pinsHtml(*data, "devices/");
     fs << "</td></tr></table";
-    QStringList names = msf.names();
-    QStringList::const_iterator it;
-    for (it=names.begin(); it!=names.end(); ++it) {
-      QImage image = QImage::fromMimeSource(*it);
-      QString filepath = dir.filePath(*it);
-      QImage old;
-      if ( !old.load(*it) || old!=image ) {
-        qDebug("  add image %s", (*it).latin1());
-        if ( !image.save(*it, "PNG") ) qFatal("Could not write \"%s\".", filepath.latin1());
-      }
+
+    for (int k=0; k<data->frequencyRanges().count(); k++) {
+      const Device::FrequencyRange &fr = data->frequencyRanges()[k];
+      QString name = Device::voltagePixmapLabel(*data, fr);
+      QPixmap pixmap = Device::voltagePixmap(fr);
+      writePixmap(dir, name, pixmap);
     }
+
+    writePixmap(dir, Device::pinsPixmapLabel(*data), Device::pinsPixmap(*data));
   }
 
-  QMimeSourceFactory::takeDefaultFactory();
   return 0;
 }

Modified: trunk/dev_utils/src/html_generator.h
===================================================================
--- trunk/dev_utils/src/html_generator.h	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/html_generator.h	2012-06-10 00:58:40 UTC (rev 2912)
@@ -9,17 +9,4 @@
 #ifndef HTML_GENERATOR_H
 #define HTML_GENERATOR_H
 
-#include <qmime.h>
-#include <qstringlist.h>
-
-class MimeSourceFactory : public QMimeSourceFactory
-{
-public:
-  virtual void setPixmap(const QString &name, const QPixmap &pixmap);
-  QStringList names() const { return _names; }
-
-private:
-  QStringList _names;
-};
-
 #endif

Modified: trunk/dev_utils/src/inc_parser.cpp
===================================================================
--- trunk/dev_utils/src/inc_parser.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/inc_parser.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -62,14 +62,14 @@
   if ( _data.name()=="14000" && ( name=="_CPP_ON" || name=="_CPP_OFF" || name=="_CPU_ON" || name=="_CPU_OFF" ) )
     return true; // #### FIXME
   const Pic::Config::Word &cw = _data.config()._words[wordIndex];
-  for (uint k=0; k<cw.masks.count(); k++) {
+  for (int k=0; k<cw.masks.count(); k++) {
     const Pic::Config::Mask &cm = cw.masks[k];
     if ( SourceLine::ignoredConfigNames(_data, wordIndex).contains(name) ) return true;
-    for (uint l=0; l<cm.values.count(); l++) {
+    for (int l=0; l<cm.values.count(); l++) {
       const QStringList &cnames = cm.values[l].configNames[Pic::ConfigNameType::Default];
-      for (uint m=0; m<cnames.count(); m++) {
+      for (int m=0; m<cnames.count(); m++) {
         if ( SourceLine::transformConfigName(_data, wordIndex, cnames[m])!=name
-             && !SourceLine::extraConfigNames(_data, wordIndex, cm.values[l]).contains(name) ) continue;
+          && !SourceLine::extraConfigNames(Pic::ConfigNameType::Default, _data, wordIndex, cm.values[l]).contains(name) ) continue;
         BitValue mask = _data.mask(Pic::MemoryRangeType::Config);
         if ( _data.name()=="16C62" || _data.name()=="16C64" || _data.name()=="16C65"
              || _data.name()=="16C73" || _data.name()=="16C74" ) mask = 0x3FBF;
@@ -87,7 +87,7 @@
 bool IncParser::findName(const QString &name, BitValue value) const
 {
   if ( name.startsWith("_DEVID") || name.startsWith("_IDLOC") ) return true;
-  for (uint i=0; i<_data.config()._words.count(); i++) {
+  for (int i=0; i<_data.config()._words.count(); i++) {
     const Pic::Config::Word &cw = _data.config()._words[i];
     QString cname;
     if ( !cw.name.isEmpty() ) cname = "_" + cw.name;
@@ -111,18 +111,18 @@
   }
 
   // check our config names
-  for (uint i=0; i<_data.config()._words.count(); i++) {
+  for (int i=0; i<_data.config()._words.count(); i++) {
     const Pic::Config::Word &cw = _data.config()._words[i];
     QString cname;
     if ( !cw.name.isEmpty() ) cname = "_" + cw.name;
     if ( !cname.isEmpty() && cw.masks.count()!=0 && !_configNames.contains(cname) )
       qFatal(QString("Config name %1 not in include file").arg(cname));
-    for (uint k=0; k<cw.masks.count(); k++) {
+    for (int k=0; k<cw.masks.count(); k++) {
       const Pic::Config::Mask &cm = cw.masks[k];
       if ( cm.name=="DEBUG" && (_data.name()=="18C601" || _data.name()=="18C801") ) continue;
-      for (uint l=0; l<cm.values.count(); l++) {
+      for (int l=0; l<cm.values.count(); l++) {
         const QStringList &cnames = cm.values[l].configNames[Pic::ConfigNameType::Default];
-        for (uint m=0; m<cnames.count(); m++) {
+        for (int m=0; m<cnames.count(); m++) {
           QString name = SourceLine::transformConfigName(_data, i, cnames[m]);
           if ( !_configNames.contains(name) ) qWarning(QString("Config name %2 not in include file").arg(name));
         }
@@ -176,7 +176,7 @@
   }
 
   QStringList all = Device::Lister::instance().supportedDevices();
-  for (uint i=0; i<all.count(); i++)
+  for (int i=0; i<all.count(); i++)
     if ( devices.find(all[i])==devices.end() ) qWarning("Device \"%s\" not in any .inc file.", all[i].latin1());
 
   return 0;

Modified: trunk/dev_utils/src/list_generator.cpp
===================================================================
--- trunk/dev_utils/src/list_generator.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/list_generator.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -39,14 +39,7 @@
 {
   const Group::Base *group = Tool::Lister::instance().group(name);
   if (group == NULL) qFatal("No group \"%s\"", name.latin1());
-  const Pic::Data *pdata = (data.group().name()=="pic" ? static_cast<const Pic::Data *>(&data) : NULL);
-  Pic::Architecture arch = (pdata ? pdata->architecture() : Pic::Architecture::Nb_Types);
-  Group::Support support;
-  if ( name=="picc" ) // #### I don't have a license
-    support = (arch==Pic::Architecture::P10X || arch==Pic::Architecture::P16X || arch==Pic::Architecture::P17C ? Group::Support::Tested : Group::Support::None);
-  else if ( name=="picc18" ) // #### I don't have a license
-    support = (pdata && pdata->is18Family() ? Group::Support::Tested : Group::Support::None);
-  else support = group->deviceData(data.name()).support;
+  Group::Support support = group->deviceData(data.name()).support;
   return "echo \"<td class=\\\"devices_value\\\">" + imageHtml(support) + "</td>\";\n";
 }
 
@@ -66,23 +59,23 @@
   phps << "<?php" << endl;
 
   QStringList devices = Device::Lister::instance().supportedDevices();
-  FOR_EACH(Pic::Architecture, k) {
+  int k = 1;
+  FOR_EACH(Pic::Architecture, arch) {
     bool hasDevice = false;
-    for (uint i=0; i<devices.count(); i++) {
+    for (int i=0; i<devices.count(); i++) {
       const Device::Data *data = Device::Lister::instance().data(devices[i]);
       Q_ASSERT(data);
       if ( data->group().name()!="pic" ) continue;
-      if ( static_cast<const Pic::Data *>(data)->architecture()!=k ) continue;
+      if ( static_cast<const Pic::Data *>(data)->architecture()!=arch ) continue;
       if ( !hasDevice ) {
         hasDevice = true;
-        phps << "tableStart(\"" << k.key() << "\", \"" << k.label() << "\");" << endl;
+        phps << "tableStart(\"" << arch.key() << "\", \"" << arch.label() << "\");" << endl;
       }
-      phps << "echo \"<tr class=\\\"" << ((i%2)==0 ? "even_row" : "odd_row") /*<< "\" id=\"" << Pic::ARCHITECTURE_DATA[k].name << "\" style=\"display:none\"" */ << "\\\">\";" << endl;
+      phps << "echo \"<tr class=\\\"" << ((k%2)==0 ? "even_row" : "odd_row") /*<< "\" id=\"" << Pic::ARCHITECTURE_DATA[k].name << "\" style=\"display:none\"" */ << "\\\">\";" << endl;
       phps << "echo \"<td class=\\\"devices\\\"><a class=\\\"devices\\\" href=\\\"devices.php?device=" << data->name() << "\\\">" << data->name() << "</a></td>\";" << endl;
       phps << "echo \"<td class=\\\"empty_col\\\"></td>\";" << endl;
       phps << toolSupportHtml("gputils", *data);
       phps << toolSupportHtml("sdcc", *data);
-      phps << toolSupportHtml("picclite", *data);
       phps << "echo \"<td class=\\\"empty_col\\\"></td>\";" << endl;
       phps << progSupportHtml("direct", *data);
       phps << progSupportHtml("icd1", *data);
@@ -99,6 +92,7 @@
       phps << progSupportHtml("pickit2_bootloader", *data);
       phps << "echo \"</tr>\\n\";" << endl;
       phps << endl;
+      ++k;
     }
     if (hasDevice) phps << "echo \"</table>\\n\";" << endl;
   }

Modified: trunk/dev_utils/src/main_generator.cpp
===================================================================
--- trunk/dev_utils/src/main_generator.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/main_generator.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -11,22 +11,25 @@
 #include "common/global/about.h"
 #include "main_generator.h"
 
-const KCmdLineOptions OPTIONS[] = {
+const Piklab::CmdLineOption OPTIONS[] = {
   { "+dir", I18N_NOOP("Output directory."), 0 },
   { 0, 0, 0}
 };
 
 int main(int argc, char **argv)
 {
-  Piklab::AboutData about("generator", "generator", "");
-  Piklab::initArgs(about, argc, argv, *OPTIONS);
+  const Piklab::AboutData about("generator", "generator", "");
+  static Piklab::OptionList list;
+  for (uint i = 0; OPTIONS[i].name != NULL; ++i)
+    list.append(OPTIONS[i]);
+  Piklab::initArgs(about, argc, argv, list);
   Piklab::createApplication("generator", argc, argv, true, NULL);
 
-  KGlobal::locale()->setCountry("us"); // consistent number format...
+  KGlobal::locale()->setCountry("us", NULL); // consistent number format...
 
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
   if ( args->count()==0 ) qFatal("Output directory must be provided.");
-  QDir dir(args->url(0).path(1));
+  QDir dir(args->url(0).path());
   if ( !dir.exists() ) qFatal("Directory \"%s\" does not exists.", dir.absPath().latin1());
 
   (void)new ProjectManager::View(0); // ### DUMMY: needed for linking !!??

Modified: trunk/dev_utils/src/pickit2_to_data.cpp
===================================================================
--- trunk/dev_utils/src/pickit2_to_data.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/pickit2_to_data.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -264,18 +264,18 @@
     if ( len!=(*it).ConfigWords ) qFatal("config: lengths different %i (%i)", (*it).ConfigWords, len);
     if ( pdata->nbWords(Pic::MemoryRangeType::UserId)!=(*it).UserIdWords ) qFatal("user id: lengths different %i (%i)", (*it).UserIdWords, pdata->nbWords(Pic::MemoryRangeType::UserId));
     uint offset = pdata->range(Pic::MemoryRangeType::Config).hexFileOffset;
-    if ( pdata->architecture()!=Pic::Architecture::P10X || offset==0 ) offset += pdata->range(Pic::MemoryRangeType::Config).start.toUInt();
+    if ( pdata->architecture()!=Pic::Architecture::Baseline || offset==0 ) offset += pdata->range(Pic::MemoryRangeType::Config).start.toUInt();
     if ( !(pdata->architecture().data().properties & Pic::PackedHex) ) offset *= 2;
     if ( offset!=(*it).ConfigAddr ) qFatal("config: hex offset different %s (%s)", toHexLabel((*it).ConfigAddr, 8).latin1(), toHexLabel(offset, 8).latin1());
     offset = pdata->range(Pic::MemoryRangeType::UserId).hexFileOffset + pdata->range(Pic::MemoryRangeType::UserId).start.toUInt();
     if ( !(pdata->architecture().data().properties & Pic::PackedHex) ) offset *= 2;
     if ( offset!=(*it).UserIdAddr ) qWarning("user id: hex offset different %s (%s)", toHexLabel((*it).UserIdAddr, 8).latin1(), toHexLabel(offset, 8).latin1());
-    const Pic::Config &config = pdata->config();
-    for (uint i=0; i<pdata->nbWords(Pic::MemoryRangeType::Config); i++) {
-      const Pic::Config::Word &cword = config._words[i];
+    //const Pic::Config &config = pdata->config();
+    //for (uint i=0; i<pdata->nbWords(Pic::MemoryRangeType::Config); i++) {
+      //const Pic::Config::Word &cword = config._words[i];
       //if ( cword.cmask!=(*it).ConfigMasks[i] ) qWarning("config word %i: mask different %s (%s)", i, toHexLabel((*it).ConfigMasks[i], 4).latin1(), toHexLabel(cword.cmask, 4).latin1());
       //if ( cword.bvalue!=(*it).ConfigBlank[i] ) qWarning("config word %i: blank value different %s (%s)", i, toHexLabel((*it).ConfigBlank[i], 4).latin1(), toHexLabel(cword.bvalue, 4).latin1());
-    }
+    //}
     //const Pic::VoltageData &vpp = pdata->voltage(Pic::ProgVoltageType::Vpp);
     //if ( fdata.vpp>vpp.max || fdata.vpp<vpp.min ) qWarning("Vpp %f out of range (min=%f max=%f)", fdata.vpp, vpp.min, vpp.max);
     if ( fdata.vpp!=12.0 ) qFatal("Vpp is not 12 V");
@@ -373,12 +373,12 @@
 
   ds << endl;
   ds << "const ScriptData SCRIPT_DATA[] = {" << endl;
-  for (uint k=1; k<=scripts.count(); k++) {
+  for (int k=1; k<=scripts.count(); k++) {
     Q_ASSERT( scripts.contains(k) );
     QString name = scripts[k].Name.replace("\"", "\\\"");
     ds << "  { \"" << name << "\", " << scripts[k].Version
        << ", " << scripts[k].Script.count() << ", { ";
-    for (uint i=0; i<scripts[k].Script.count(); i++) {
+    for (int i=0; i<scripts[k].Script.count(); i++) {
       if ( i!=0 ) ds << ", ";
       ds << toHexLabel(scripts[k].Script[i], 4);
     }

Modified: trunk/dev_utils/src/picp_check/CMakeLists.txt
===================================================================
--- trunk/dev_utils/src/picp_check/CMakeLists.txt	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/picp_check/CMakeLists.txt	2012-06-10 00:58:40 UTC (rev 2912)
@@ -1,13 +1,10 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-
 SET(picp_check_SRCS
    picdev.cpp
    picp_check.cpp
 )
-kde3_automoc(${picp_check_SRCS})
-kde3_add_executable(picp_check ${picp_check_SRCS})
-target_link_libraries(picp_check ${GUI_LIBS} ${LIBUSB_LIBRARIES}
-                      ${PIKLAB_BINDIR}/src/progs/psp/base/libpsp.a
-                      ${PIKLAB_BINDIR}/src/devices/list/libdevicelistnoui.a
-                      ${BASE_LIBS})
+automoc(${picp_check_SRCS})
+
+add_executable(picp_check ${picp_check_SRCS})
+target_link_libraries(picp_check ${ALL_LIBS} ${GUI_LIBS})

Modified: trunk/dev_utils/src/reg_extractor.cpp
===================================================================
--- trunk/dev_utils/src/reg_extractor.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/reg_extractor.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -59,10 +59,10 @@
   }
 
   // mirror regs
-  for (uint i=0; i<_sections.count(); i++) {
+  for (int i=0; i<_sections.count(); i++) {
     if ( _sections[i].name!="MirrorRegs" ) continue;
     QDomElement e = _doc.createElement("mirror");
-    for (uint k=0; k<_sections[i].unamedAttributes.count(); k++) {
+    for (int k=0; k<_sections[i].unamedAttributes.count(); k++) {
       Address start, end;
       extractRange(_sections[i].unamedAttributes[k], start, end);
       QDomElement r = _doc.createElement("range");
@@ -74,7 +74,7 @@
   }
 
   // unused regs
-  for (uint i=0; i<_sections.count(); i++) {
+  for (int i=0; i<_sections.count(); i++) {
     if ( _sections[i].name!="UnusedRegs" ) continue;
     QDomElement e = _doc.createElement("unused");
     if ( _sections[i].unamedAttributes.count()!=1 ) qFatal("Unused have more or less than 1 range");
@@ -86,12 +86,12 @@
   }
 
   // sfr
-  for (uint i=0; i<_sections.count(); i++) {
+  for (int i=0; i<_sections.count(); i++) {
     if (_sections[i].name != "sfr") continue;
     QDomElement e;
     QString key = _sections[i].attributes["key"];
     bool ok;
-    uint size = _sections[i].attributes["size"].toUInt(&ok);
+    int size = _sections[i].attributes["size"].toUInt(&ok);
     if ( !ok || size==0 ) qFatal("Malformed or null size attribute");
     if ( _sections[i].attributes["flags"]=="j" ) {
       e = _doc.createElement("combined");
@@ -104,7 +104,7 @@
       QStringList list = QStringList::split(' ', s);
       if ( list.count()!=8*size ) qFatal("Access attribute has wrong number of fields");
       QValueVector<Pic::RegisterBitProperties> bits(list.count());
-      for (uint j=0; j<bits.count(); j++) {
+      for (int j=0; j<bits.count(); j++) {
         if ( list[j]=="r" ) bits[j] = Pic::RegisterBitRead;
         else if ( list[j]=="w" ) bits[j] = Pic::RegisterBitWrite;
         else if ( list[j]=="rw" ) bits[j] = Pic::RegisterBitRead | Pic::RegisterBitWrite;
@@ -113,11 +113,11 @@
         else if ( list[j]=="rs" ) bits[j] = Pic::RegisterBitRead | Pic::RegisterBitOnlySoftwareSet;
         else qFatal(QString("Unknown register bit %1:%2").arg(key).arg(list[j]));
       }
-      for (uint j=0; j<bits.count(); j++) list[j] = toHex(bits[j], 1);
+      for (int j=0; j<bits.count(); j++) list[j] = toHex(bits[j], 1);
       e.setAttribute("access", list.join(""));
       // bit por
       QValueVector<Pic::RegisterBitState> states(list.count());
-      uint k = 0;
+      int k = 0;
       for (; k<_sections[i].sections.count(); k++)
         if ( _sections[i].sections[k].name=="reset" ) break;
       if ( k==_sections[i].sections.count() ) {
@@ -126,7 +126,7 @@
       }
       s = _sections[i].sections[k].attributes["por"];
       if ( s.length()!=states.count() ) qFatal(QString("POR of incorrect length (%1)").arg(key));
-      for (uint j=0; j<states.count(); j++) {
+      for (int j=0; j<states.count(); j++) {
         states[j] = Pic::RegisterBitUnknown;
         if ( s[j]=='0' ) states[j] = Pic::RegisterBitLow;
         else if ( s[j]=='1' ) states[j] = Pic::RegisterBitHigh;
@@ -135,12 +135,12 @@
         else if ( s[j]=='y' ) states[j] = Pic::RegisterBitDependsConfig;
         else if ( s[j]!='-' && s[j]!='x' ) qFatal(QString("Unknown POR bit '%1' (%2)").arg(s[j]).arg(key));
       }
-      for (uint j=0; j<bits.count(); j++) list[j] = toHex(states[j], 1);
+      for (int j=0; j<bits.count(); j++) list[j] = toHex(states[j], 1);
       e.setAttribute("por", list.join(""));
       // bit mclr
       s = _sections[i].sections[k].attributes["mclr"];
       if ( s.length()!=states.count() ) qFatal(QString("MCLR of incorrect length (%1)").arg(key));
-      for (uint j=0; j<states.count(); j++) {
+      for (int j=0; j<states.count(); j++) {
         states[j] = Pic::RegisterBitUnknown;
         if ( s[j]=='0' ) states[j] = Pic::RegisterBitLow;
         else if ( s[j]=='1' ) states[j] = Pic::RegisterBitHigh;
@@ -149,7 +149,7 @@
         else if ( s[j]=='y' ) states[j] = Pic::RegisterBitDependsConfig;
         else if ( s[j]!='-' && s[j]!='x' ) qFatal(QString("Unknown MCLR bit (%2) '%1'").arg(s[j]).arg(key));
       }
-      for (uint j=0; j<bits.count(); j++) list[j] = toHex(states[j], 1);
+      for (int j=0; j<bits.count(); j++) list[j] = toHex(states[j], 1);
       e.setAttribute("mclr", list.join(""));
     }
     e.setAttribute("name", key);

Modified: trunk/dev_utils/src/usb_snoop_filter.cpp
===================================================================
--- trunk/dev_utils/src/usb_snoop_filter.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/usb_snoop_filter.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -17,6 +17,7 @@
 
 #include "common/common/misc.h"
 #include "common/common/number.h"
+#include "common/global/about.h"
 
 bool withTime, shortOutput;
 QRegExp tbre("TransferBuffer: .+ \\(([0-9]+)\\) length");
@@ -29,7 +30,7 @@
   QString s;
   for (uint i=0; i<nbLines; i++) {
     QStringList list = QStringList::split(' ', sin.readLine());
-    uint k = 1;
+    int k = 1;
     for (; k<list.count(); k++) {
       char c = char(fromHex(list[k], 0));
       if ( !isalnum(c) && c!=']' && c!='[' && c!='}' && c!='{' && c!='<' && c!='>' ) {
@@ -59,22 +60,25 @@
   return s;
 }
 
-static const KCmdLineOptions OPTIONS[] = {
+const Piklab::CmdLineOption OPTIONS[] = {
   { "short", I18N_NOOP("Short output"), 0 },
   { "with-time", I18N_NOOP("Add timestamps"), 0 },
   { "+file", I18N_NOOP("Text file copied and pasted from SnoopyPro"), 0 },
-  KCmdLineLastOption
+  { 0, 0, 0}
 };
 
 int main(int argc, char **argv)
 {
-  KCmdLineArgs::init(argc, argv, "usb_snoop_filter", "usb_snoop_filter", "", "", true);
-  KCmdLineArgs::addCmdLineOptions(OPTIONS);
+  const Piklab::AboutData about("usb_snoop_filter", "usb_snoop_filter", "");
+  static Piklab::OptionList list;
+  for (uint i = 0; OPTIONS[i].name != NULL; ++i)
+    list.append(OPTIONS[i]);
+  Piklab::initArgs(about, argc, argv, list);
+
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
   if ( args->count()==0 ) args->usage();
   QFile in(args->url(0).fileName());
-  if ( !in.open(IO_ReadOnly) ) qFatal("Could not open file \"%s\".\n", args->url(0).prettyURL().latin1());
+  if ( !in.open(IO_ReadOnly) ) qFatal("Could not open file \"%s\".\n", args->url(0).prettyUrl().latin1());
   QTextStream sin(&in);
 
   QFileInfo finfo(in);

Modified: trunk/dev_utils/src/usbmon_filter.cpp
===================================================================
--- trunk/dev_utils/src/usbmon_filter.cpp	2012-06-10 00:56:23 UTC (rev 2911)
+++ trunk/dev_utils/src/usbmon_filter.cpp	2012-06-10 00:58:40 UTC (rev 2912)
@@ -51,14 +51,14 @@
         qFatal("Unrecognized data: \"%s\".\n", s2.latin1());
       }
       s2 = rexp2.cap(3);
-      std::cout << s2 << std::endl;
+      std::cout << (const char*)s2.toAscii() << std::endl;
       if (s2.startsWith("=")) {
         s2 = s2.mid(2);
         QString s;
-        for (uint i = 0; i<s2.length(); ++i) {
+        for (int i = 0; i<s2.length(); ++i) {
           if (s2[i] == ' ') continue;
           bool ok = false;
-          char c = fromString(NumberBase::Hex, s2.mid(i, 2), 2, &ok);
+          char c = fromString(NumberBase::Hex, s2.mid(i, 2).toAscii(), 2, &ok);
           if (!ok) {
             qFatal("Unrecognized hex: \"%s\".\n", s2.mid(i, 2).latin1());
           }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2911] trunk/piklab_kde4/src

From: <az...@us...> - 2012-06-10 00:56:31

Revision: 2911
          http://piklab.svn.sourceforge.net/piklab/?rev=2911&view=rev
Author:   azhyd
Date:     2012-06-10 00:56:23 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
fix compilation with KDE

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/global.h
    trunk/piklab_kde4/src/common/global/purl.h
    trunk/piklab_kde4/src/common/gui/purl_gui.cpp
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/project.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp

Modified: trunk/piklab_kde4/src/common/common/global.h
===================================================================
--- trunk/piklab_kde4/src/common/common/global.h	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/common/global.h	2012-06-10 00:56:23 UTC (rev 2911)
@@ -59,8 +59,6 @@
 #  include <kaboutdata.h>
 #  include <kurl.h>
 
-typedef Kurl::List KurlList;
-
 #endif
 
 #if defined(Q_OS_WIN)

Modified: trunk/piklab_kde4/src/common/global/purl.h
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.h	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/global/purl.h	2012-06-10 00:56:23 UTC (rev 2911)
@@ -71,7 +71,7 @@
 {
 public:
   Url() {}
-  explicit Url(const KUrl &url) : Base(url) {}
+  Url(const KUrl &url) : Base(url) {}
   // add correct extension if filename has no extension
   Url(const Directory &path, const QString &filename, FileType type);
   Url(const Directory &path, const QString &filepath);

Modified: trunk/piklab_kde4/src/common/gui/purl_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/purl_gui.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/common/gui/purl_gui.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -47,7 +47,7 @@
 PURL::Directory PURL::getExistingDirectory(const QString &startDir, QWidget *widget,
                                            const QString &caption)
 {
-  KURL kurl = KDirSelectDialog::selectDirectory(startDir, false, widget, caption);
+  KUrl kurl = KDirSelectDialog::selectDirectory(startDir, false, widget, caption);
   if ( kurl.isEmpty() ) return Directory();
   return Directory(kurl.path(KUrl::AddTrailingSlash));
 }

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -409,10 +409,10 @@
 
 PURL::Url findDocumentUrl(const QString &prefix, const QString &baseName)
 {
-  PURL::Url previous = KURL(prefix + baseName + ".pdf");
+  PURL::Url previous = KUrl(prefix + baseName + ".pdf");
   bool previousExists = previous.exists();
   for (uint i=0; i<26; i++) {
-    PURL::Url url = KURL(prefix + baseName + QChar('a' + i) + ".pdf");
+    PURL::Url url = KUrl(prefix + baseName + QChar('a' + i) + ".pdf");
     bool exists = url.exists();
     if ( !exists && previousExists ) return previous;
     previous = url;

Modified: trunk/piklab_kde4/src/libgui/project.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/project.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -206,7 +206,7 @@
   for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {
     QStringList slist = QStringList::split(",", *it);
     QStringList::const_iterator sit = slist.begin();
-    KURL& kurl = const_cast<KURL&>(url.kurl());
+    KUrl& kurl = const_cast<KUrl&>(url.kurl());
     if ( sit==slist.end() || (*sit)!=kurl.url() ) continue;
     for (; sit!=slist.end(); ++sit) {
       bool ok;
@@ -220,7 +220,7 @@
 }
 void Project::setBookmarkLines(const PURL::Url &url, const QValueList<uint> &lines)
 {
-  KURL& kurl = const_cast<KURL&>(url.kurl());
+  KUrl& kurl = const_cast<KUrl&>(url.kurl());
   QStringList list = listValues("editors", "bookmarks", QStringList());
   QStringList nlist;
   for (QStringList::const_iterator it = list.begin(); it != list.end(); ++it) {

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-06-10 00:47:55 UTC (rev 2910)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-06-10 00:56:23 UTC (rev 2911)
@@ -385,7 +385,7 @@
   updateGUI();
 }
 
-void MainWindow::openRecentFile(const KURL &kurl)
+void MainWindow::openRecentFile(const KUrl &kurl)
 {
   Main::_editorManager->openFile(PURL::Url(kurl));
 }
@@ -868,7 +868,7 @@
   Main::_compileLog->clear();
 }
 
-void MainWindow::openRecentProject(const KURL &url)
+void MainWindow::openRecentProject(const KUrl &url)
 {
   stopOperations();
   Main::_projectManager->openProject(PURL::Url(url));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2910] trunk/piklab_kde4

From: <az...@us...> - 2012-06-10 00:48:07

Revision: 2910
          http://piklab.svn.sourceforge.net/piklab/?rev=2910&view=rev
Author:   azhyd
Date:     2012-06-10 00:47:55 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
compile command-line utilities with Qt only

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/piklab.kdev4
    trunk/piklab_kde4/src/CMakeLists.txt
    trunk/piklab_kde4/src/common/CMakeLists.txt
    trunk/piklab_kde4/src/common/common/global.h
    trunk/piklab_kde4/src/common/global/CMakeLists.txt
    trunk/piklab_kde4/src/common/global/purl.cpp
    trunk/piklab_kde4/src/common/global/purl.h
    trunk/piklab_kde4/src/common/nokde/CMakeLists.txt
    trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.h
    trunk/piklab_kde4/src/common/nokde/nokde_kcmdlineargs.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kcmdlineargs.h
    trunk/piklab_kde4/src/common/nokde/nokde_klocale.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_klocale.h
    trunk/piklab_kde4/src/common/nokde/nokde_pfile.cpp
    trunk/piklab_kde4/src/common/nokde_gui/nokde_misc_ui.h
    trunk/piklab_kde4/src/devices/CMakeLists.txt
    trunk/piklab_kde4/src/devices/base/device_group.cpp
    trunk/piklab_kde4/src/devices/base/device_group.h
    trunk/piklab_kde4/src/devices/list/CMakeLists.txt
    trunk/piklab_kde4/src/devices/mem24/CMakeLists.txt
    trunk/piklab_kde4/src/devices/pic/CMakeLists.txt
    trunk/piklab_kde4/src/piklab-test/CMakeLists.txt
    trunk/piklab_kde4/src/progs/CMakeLists.txt
    trunk/piklab_kde4/src/progs/bootloader/CMakeLists.txt
    trunk/piklab_kde4/src/progs/direct/CMakeLists.txt
    trunk/piklab_kde4/src/progs/gpsim/CMakeLists.txt
    trunk/piklab_kde4/src/progs/icd1/CMakeLists.txt
    trunk/piklab_kde4/src/progs/icd2/CMakeLists.txt
    trunk/piklab_kde4/src/progs/icd3/CMakeLists.txt
    trunk/piklab_kde4/src/progs/list/CMakeLists.txt
    trunk/piklab_kde4/src/progs/picdem_bootloader/CMakeLists.txt
    trunk/piklab_kde4/src/progs/pickit1/CMakeLists.txt
    trunk/piklab_kde4/src/progs/pickit2/CMakeLists.txt
    trunk/piklab_kde4/src/progs/pickit2_bootloader/CMakeLists.txt
    trunk/piklab_kde4/src/progs/pickit2v2/CMakeLists.txt
    trunk/piklab_kde4/src/progs/psp/CMakeLists.txt
    trunk/piklab_kde4/src/progs/tbl_bootloader/CMakeLists.txt

Added Paths:
-----------
    trunk/piklab_kde4/src/common/nokde/nokde_kprocess.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kprocess.h
    trunk/piklab_kde4/src/common/nokde/nokde_kprocess_p.h
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.h

Removed Paths:
-------------
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.cpp
    trunk/piklab_kde4/src/common/nokde/nokde_kurl.h

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/Changelog	2012-06-10 00:47:55 UTC (rev 2910)
@@ -1,3 +1,6 @@
+0.16.1 (9 June 2012)
+* compile command-line utilities with Qt only
+
 0.16.0 (3 June 2012)
 * port to KDE4
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]

Modified: trunk/piklab_kde4/piklab.kdev4
===================================================================
--- trunk/piklab_kde4/piklab.kdev4	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/piklab.kdev4	2012-06-10 00:47:55 UTC (rev 2910)
@@ -1,3 +1,3 @@
 [Project]
 Manager=KDevCMakeManager
-Name=piklab_kde4
+Name=piklab_qt4

Modified: trunk/piklab_kde4/src/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/CMakeLists.txt	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/CMakeLists.txt	2012-06-10 00:47:55 UTC (rev 2910)
@@ -7,10 +7,11 @@
 add_subdirectory(progs)
 add_subdirectory(piklab-prog)
 add_subdirectory(piklab-test)
-add_subdirectory(tools)
-add_subdirectory(libgui)
-add_subdirectory(piklab)
 
+
 if(NOT QT_ONLY)
     add_subdirectory(data)
+    add_subdirectory(libgui)
+    add_subdirectory(tools)
+    add_subdirectory(piklab)
 endif(NOT QT_ONLY)

Modified: trunk/piklab_kde4/src/common/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/common/CMakeLists.txt	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/CMakeLists.txt	2012-06-10 00:47:55 UTC (rev 2910)
@@ -2,12 +2,12 @@
 add_subdirectory(global)
 add_subdirectory(port)
 add_subdirectory(cli)
-add_subdirectory(gui)
 
 if(QT_ONLY)
     add_subdirectory(nokde)
-    add_subdirectory(nokde_gui)
+#    add_subdirectory(nokde_gui)
 else(QT_ONLY)
     add_subdirectory(kde)
     add_subdirectory(kde_gui)
+    add_subdirectory(gui)
 endif(QT_ONLY)

Modified: trunk/piklab_kde4/src/common/common/global.h
===================================================================
--- trunk/piklab_kde4/src/common/common/global.h	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/common/global.h	2012-06-10 00:47:55 UTC (rev 2910)
@@ -19,6 +19,9 @@
 #include <qstringlist.h>
 #include <qobject.h>
 #include <qdir.h>
+#include <qurl.h>
+#include <qtemporaryfile.h>
+#include <qmap.h>
 
 #include <QCoreApplication>
 #include <QPointer>
@@ -37,13 +40,14 @@
 
 #if defined(NO_KDE)
 
+typedef QTemporaryFile KTemporaryFile;
+
+#  include "common/nokde/nokde_klocale.h"
 #  include "common/nokde/nokde_kurl.h"
-#  include "common/nokde/nokde_klocale.h"
 #  include "common/nokde/nokde_kcmdlineargs.h"
 #  include "common/nokde/nokde_kaboutdata.h"
+#  include "common/nokde/nokde_kprocess.h"
 
-using namespace Piklab;
-
 #else
 
 #  include <kapplication.h>
@@ -55,7 +59,7 @@
 #  include <kaboutdata.h>
 #  include <kurl.h>
 
-typedef KUrl KURL;
+typedef Kurl::List KurlList;
 
 #endif
 

Modified: trunk/piklab_kde4/src/common/global/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/common/global/CMakeLists.txt	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/global/CMakeLists.txt	2012-06-10 00:47:55 UTC (rev 2910)
@@ -22,12 +22,8 @@
    progress_monitor.cpp
    purl.cpp
    xml_data_file.cpp
+   process_kde.cpp
 )
-if(NOT QT_ONLY)
-    SET(global_STAT_SRCS ${global_STAT_SRCS}
-       process_kde.cpp
-    )
-endif(NOT QT_ONLY)
 automoc(${global_STAT_SRCS})
 add_library(global STATIC ${global_STAT_SRCS})
 

Modified: trunk/piklab_kde4/src/common/global/purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.cpp	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/global/purl.cpp	2012-06-10 00:47:55 UTC (rev 2910)
@@ -194,7 +194,7 @@
   }
 }
 
-PURL::Base::Base(const KURL &url)
+PURL::Base::Base(const KUrl &url)
   : _relative(false), _url(url)
 {
   _url.cleanPath();
@@ -236,13 +236,7 @@
 
 QString PURL::Base::pretty() const
 {
-#if defined(NO_KDE)
-  QString s = _url.toString();
-  if ( s.startsWith("://") ) return s.mid(3);
-  return s;
-#else
   return _url.pathOrUrl();
-#endif
 }
 
 PURL::Directory PURL::Base::directory() const
@@ -393,10 +387,12 @@
 }
 
 //-----------------------------------------------------------------------------
-PURL::UrlList::UrlList(const KURL::List &list)
+PURL::UrlList::UrlList(const KUrl::List &list)
 {
-  KURL::List::const_iterator it;
-  for (it=list.begin(); it!=list.end(); ++it) append(*it);
+  for (KUrl::List::const_iterator it=list.begin(); it!=list.end(); ++it) {
+    Url url(*it);
+    append(url);
+  }
 }
 
 //-----------------------------------------------------------------------------
@@ -449,10 +445,10 @@
 PURL::Url PURL::fromPathOrUrl(const QString &s, bool keepRelative)
 {
   if (s.isEmpty()) return PURL::Url();
-  KURL kurl(s);
+  KUrl kurl(s);
   if (!kurl.protocol().isEmpty()
        && kurl.protocol() != "file"
-       && kurl.protocol().length() != 1) return kurl;
+       && kurl.protocol().length() != 1) return Url(kurl);
   QString filepath = (s.startsWith("file://") ? s.mid(7) : s);
   if (isRelative(filepath) && !keepRelative) return Url(currentDirectory(), filepath);
   return Url(filepath);

Modified: trunk/piklab_kde4/src/common/global/purl.h
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.h	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/global/purl.h	2012-06-10 00:47:55 UTC (rev 2910)
@@ -44,11 +44,11 @@
 {
 public:
   Base(const QString &filepath = QString::null);
-  Base(const KURL &url);
+  Base(const KUrl &url);
   bool operator <(const Base &url) const { return _url<url._url; }
   bool operator ==(const Base &url) const;
   bool operator !=(const Base &url) const { return !(_url==url._url); }
-  const KURL &kurl() const { return _url; }
+  const KUrl &kurl() const { return _url; }
   QString pretty() const;
   bool isEmpty() const { return _url.isEmpty(); }
   bool isLocal() const;
@@ -60,7 +60,7 @@
 
 protected:
   bool _relative;
-  KURL _url;
+  KUrl _url;
 
 private:
   bool httpUrlExists(bool *ok = 0) const;
@@ -71,7 +71,7 @@
 {
 public:
   Url() {}
-  Url(const KURL &url) : Base(url) {}
+  explicit Url(const KUrl &url) : Base(url) {}
   // add correct extension if filename has no extension
   Url(const Directory &path, const QString &filename, FileType type);
   Url(const Directory &path, const QString &filepath);
@@ -106,7 +106,7 @@
   UrlList() {}
   UrlList(const Url &url) { append(url); }
   UrlList(const QValueList<Url> &list) : QValueList<Url>(list) {}
-  UrlList(const KURL::List &list);
+  UrlList(const KUrl::List &list);
 };
 
 //----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/common/nokde/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/common/nokde/CMakeLists.txt	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/nokde/CMakeLists.txt	2012-06-10 00:47:55 UTC (rev 2910)
@@ -5,6 +5,7 @@
   nokde_kcmdlineargs.cpp
   nokde_klocale.cpp
   nokde_kurl.cpp
+  nokde_kprocess.cpp
   nokde_pfile.cpp
   nokde_purl.cpp
 )
@@ -16,5 +17,4 @@
 endif(WIN32)
 
 automoc(${nokde_STAT_SRCS})
-
 add_library(nokde STATIC ${nokde_STAT_SRCS})

Modified: trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.cpp
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.cpp	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.cpp	2012-06-10 00:47:55 UTC (rev 2910)
@@ -1,8 +1,9 @@
-// modified from KDE 3.4 for Windows port (Nicolas Hadacek)
-
 /*
  * This file is part of the KDE Libraries
  * Copyright (C) 2000 Espen Sand (es...@kd...)
+ * Copyright (C) 2006 Nicolas GOUTTE <go...@kd...>
+ * Copyright (C) 2008 Friedrich W. H. Kossebau <kos...@kd...>
+ * Copyright (C) 2010 Teo Mrnjavac <te...@kd...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -16,460 +17,937 @@
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  */
 
-
 #include "nokde_kaboutdata.h"
-//#include <kstandarddirs.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qstringlist.h>
 
-using namespace Piklab;
+#include "nokde_klocale.h"
 
-QString
-KAboutPerson::name() const
+//#include "kstandarddirs.h"
+//#include "klocalizedstring.h"
+
+#include <QtCore/QFile>
+#include <QtCore/QTextIStream>
+#include <QtCore/QSharedData>
+#include <QtCore/QVariant>
+#include <QtCore/QList>
+#include <QHash>
+#include <QStringList>
+
+// -----------------------------------------------------------------------------
+// Design notes:
+//
+// These classes deal with a lot of text, some of which needs to be
+// marked for translation. Since at the time when these object and calls are
+// made the translation catalogs are usually still not initialized, the
+// translation has to be delayed. This is achieved by using KLocalizedString
+// for translatable strings. KLocalizedStrings are produced by ki18n* calls,
+// instead of the more usuall i18n* calls which produce QString by trying to
+// translate immediately.
+//
+// All the non-translatable string arguments to methods are taken QByteArray,
+// all the translatable are KLocalizedString. The getter methods always return
+// proper QString: the non-translatable strings supplied by the code are
+// treated with QString::fromUtf8(), those coming from the outside with
+// QTextCodec::toUnicode(), and translatable strings are finalized to QStrings
+// at the point of getter calls (i.e. delayed translation).
+// -----------------------------------------------------------------------------
+
+class KAboutPerson::Private
 {
-   return QString::fromUtf8(mName);
+public:
+   KLocalizedString _name;
+   KLocalizedString _task;
+   QString _emailAddress;
+   QString _webAddress;
+   QString _ocsUsername;
+
+   QString _nameNoop;
+};
+
+KAboutPerson::KAboutPerson( const KLocalizedString &_name,
+                            const KLocalizedString &_task,
+                            const QByteArray &_emailAddress,
+                            const QByteArray &_webAddress )
+  : d(new Private)
+{
+   d->_name = _name;
+   d->_task = _task;
+   d->_emailAddress = QString::fromUtf8(_emailAddress);
+   d->_webAddress = QString::fromUtf8(_webAddress);
 }
 
-QString
-KAboutPerson::task() const
+KAboutPerson::KAboutPerson( const KLocalizedString &_name,
+                            const KLocalizedString &_task,
+                            const QByteArray &_emailAddress,
+                            const QByteArray &_webAddress,
+                            const QByteArray &_ocsUsername )
+  : d(new Private)
 {
-   if (mTask && *mTask)
-      return i18n(mTask);
-   else
-      return QString::null;
+   d->_name = _name;
+   d->_task = _task;
+   d->_emailAddress = QString::fromUtf8(_emailAddress);
+   d->_webAddress = QString::fromUtf8(_webAddress);
+   d->_ocsUsername = QString::fromUtf8( _ocsUsername );
 }
 
-QString
-KAboutPerson::emailAddress() const
+KAboutPerson::KAboutPerson( const QString &_name, const QString &_email )
+  : d(new Private)
 {
-   return QString::fromUtf8(mEmailAddress);
+   d->_nameNoop = _name;
+   d->_emailAddress = _email;
 }
 
+KAboutPerson::KAboutPerson(const KAboutPerson& other): d(new Private)
+{
+    *d = *other.d;
+}
 
-QString
-KAboutPerson::webAddress() const
+KAboutPerson::~KAboutPerson()
 {
-   return QString::fromUtf8(mWebAddress);
+   delete d;
 }
 
+QString KAboutPerson::name() const
+{
+   if (!d->_nameNoop.isEmpty())
+      return d->_nameNoop;
+   return d->_name.toString();
+}
 
-KAboutTranslator::KAboutTranslator(const QString & name,
-                const QString & emailAddress)
+QString KAboutPerson::task() const
 {
-    mName=name;
-    mEmail=emailAddress;
+   if (!d->_task.isEmpty())
+      return d->_task.toString();
+   return QString();
 }
 
-QString KAboutTranslator::name() const
+QString KAboutPerson::emailAddress() const
 {
-    return mName;
+   return d->_emailAddress;
 }
 
-QString KAboutTranslator::emailAddress() const
+
+QString KAboutPerson::webAddress() const
 {
-    return mEmail;
+   return d->_webAddress;
 }
 
-namespace Piklab
+QString KAboutPerson::ocsUsername() const
 {
+    return d->_ocsUsername;
+}
 
-class KAboutDataPrivate
+KAboutPerson &KAboutPerson::operator=(const KAboutPerson& other)
 {
+   *d = *other.d;
+   return *this;
+}
+
+
+
+class KAboutLicense::Private : public QSharedData
+{
 public:
-    KAboutDataPrivate()
-        : translatorName("_: NAME OF TRANSLATORS\nYour names")
-        , translatorEmail("_: EMAIL OF TRANSLATORS\nYour emails")
-        , productName(0)
-//        , programLogo(0)
+    Private( enum KAboutData::LicenseKey licenseType, const KAboutData *aboutData );
+    Private( const QString &pathToFile, const KAboutData *aboutData );
+    Private( const KLocalizedString &licenseText, const KAboutData *aboutData );
+    Private( const Private& other);
+public:
+    enum KAboutData::LicenseKey  _licenseKey;
+    KLocalizedString             _licenseText;
+    QString                      _pathToLicenseTextFile;
+    // needed for access to the possibly changing copyrightStatement()
+    const KAboutData *           _aboutData;
+};
+
+KAboutLicense::Private::Private( enum KAboutData::LicenseKey licenseType, const KAboutData *aboutData )
+  : QSharedData(),
+    _licenseKey( licenseType ),
+    _aboutData( aboutData )
+{
+}
+
+KAboutLicense::Private::Private( const QString &pathToFile, const KAboutData *aboutData )
+  : QSharedData(),
+    _licenseKey( KAboutData::License_File ),
+    _pathToLicenseTextFile( pathToFile ),
+    _aboutData( aboutData )
+{
+}
+
+KAboutLicense::Private::Private( const KLocalizedString &licenseText, const KAboutData *aboutData )
+  : QSharedData(),
+    _licenseKey( KAboutData::License_Custom ),
+    _licenseText( licenseText ),
+    _aboutData( aboutData )
+{
+}
+
+KAboutLicense::Private::Private(const KAboutLicense::Private& other)
+  : QSharedData(other),
+    _licenseKey( other._licenseKey ),
+    _licenseText( other._licenseText ),
+    _pathToLicenseTextFile( other._pathToLicenseTextFile ),
+    _aboutData( other._aboutData )
+{}
+
+
+KAboutLicense::KAboutLicense( enum KAboutData::LicenseKey licenseType, const KAboutData *aboutData )
+  : d(new Private(licenseType,aboutData))
+{
+}
+
+KAboutLicense::KAboutLicense( const QString &pathToFile, const KAboutData *aboutData )
+  : d(new Private(pathToFile,aboutData))
+{
+}
+
+KAboutLicense::KAboutLicense( const KLocalizedString &licenseText, const KAboutData *aboutData )
+  : d(new Private(licenseText,aboutData))
+{
+}
+
+KAboutLicense::KAboutLicense(const KAboutLicense& other)
+  : d(other.d)
+{
+}
+
+KAboutLicense::~KAboutLicense()
+{}
+
+QString KAboutLicense::text() const
+{
+    QString result;
+
+    const QString lineFeed = QString::fromLatin1( "\n\n" );
+
+    if (d->_aboutData && !d->_aboutData->copyrightStatement().isEmpty()) {
+        result = d->_aboutData->copyrightStatement() + lineFeed;
+    }
+
+    bool knownLicense = false;
+    QString pathToFile;
+    switch ( d->_licenseKey )
+    {
+    case KAboutData::License_File:
+        pathToFile = d->_pathToLicenseTextFile;
+        break;
+    case KAboutData::License_GPL_V2:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/GPL_V2"));
+        break;
+    case KAboutData::License_LGPL_V2:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/LGPL_V2"));
+        break;
+    case KAboutData::License_BSD:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/BSD"));
+        break;
+    case KAboutData::License_Artistic:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/ARTISTIC"));
+        break;
+    case KAboutData::License_QPL_V1_0:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/QPL_V1.0"));
+        break;
+    case KAboutData::License_GPL_V3:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/GPL_V3"));
+        break;
+    case KAboutData::License_LGPL_V3:
+        knownLicense = true;
+        pathToFile = KStandardDirs::locate("data", QString::fromLatin1("LICENSES/LGPL_V3"));
+        break;
+    case KAboutData::License_Custom:
+        if (!d->_licenseText.isEmpty()) {
+            result = d->_licenseText.toString();
+            break;
+        }
+        // fall through
+    default:
+        result += i18n("No licensing terms for this program have been specified.\n"
+                       "Please check the documentation or the source for any\n"
+                       "licensing terms.\n");
+    }
+
+    if (knownLicense) {
+        result += i18n("This program is distributed under the terms of the %1.", name(KAboutData::ShortName));
+        if (!pathToFile.isEmpty()) {
+            result += lineFeed;
+        }
+    }
+
+    if (!pathToFile.isEmpty()) {
+        QFile file(pathToFile);
+        if (file.open(QIODevice::ReadOnly)) {
+            QTextStream str(&file);
+            result += str.readAll();
+        }
+    }
+
+    return result;
+}
+
+
+QString KAboutLicense::name(KAboutData::NameFormat formatName) const
+{
+    QString licenseShort;
+    QString licenseFull;
+
+    switch (d->_licenseKey) {
+    case KAboutData::License_GPL_V2:
+        licenseShort = i18nc("@item license (short name)","GPL v2");
+        licenseFull = i18nc("@item license","GNU General Public License Version 2");
+        break;
+    case KAboutData::License_LGPL_V2:
+        licenseShort = i18nc("@item license (short name)","LGPL v2");
+        licenseFull = i18nc("@item license","GNU Lesser General Public License Version 2");
+        break;
+    case KAboutData::License_BSD:
+        licenseShort = i18nc("@item license (short name)","BSD License");
+        licenseFull = i18nc("@item license","BSD License");
+        break;
+    case KAboutData::License_Artistic:
+        licenseShort = i18nc("@item license (short name)","Artistic License");
+        licenseFull = i18nc("@item license","Artistic License");
+        break;
+    case KAboutData::License_QPL_V1_0:
+        licenseShort = i18nc("@item license (short name)","QPL v1.0");
+        licenseFull = i18nc("@item license","Q Public License");
+        break;
+    case KAboutData::License_GPL_V3:
+        licenseShort = i18nc("@item license (short name)","GPL v3");
+        licenseFull = i18nc("@item license","GNU General Public License Version 3");
+        break;
+    case KAboutData::License_LGPL_V3:
+        licenseShort = i18nc("@item license (short name)","LGPL v3");
+        licenseFull = i18nc("@item license","GNU Lesser General Public License Version 3");
+        break;
+    case KAboutData::License_Custom:
+    case KAboutData::License_File:
+        licenseShort = licenseFull = i18nc("@item license","Custom");
+        break;
+    default:
+        licenseShort = licenseFull = i18nc("@item license","Not specified");
+    }
+
+    const QString result =
+        (formatName == KAboutData::ShortName ) ? licenseShort :
+        (formatName == KAboutData::FullName ) ?  licenseFull :
+                                                 QString();
+
+    return result;
+}
+
+
+KAboutLicense &KAboutLicense::operator=(const KAboutLicense& other)
+{
+   d = other.d;
+   return *this;
+}
+
+KAboutData::LicenseKey KAboutLicense::key() const
+{
+    return d->_licenseKey;
+}
+
+KAboutLicense KAboutLicense::byKeyword(const QString &rawKeyword)
+{
+    // Setup keyword->enum dictionary on first call.
+    // Use normalized keywords, by the algorithm below.
+    static QHash<QByteArray, KAboutData::LicenseKey> ldict;
+    if (ldict.isEmpty()) {
+        ldict.insert("gpl", KAboutData::License_GPL);
+        ldict.insert("gplv2", KAboutData::License_GPL_V2);
+        ldict.insert("gplv2+", KAboutData::License_GPL_V2);
+        ldict.insert("lgpl", KAboutData::License_LGPL);
+        ldict.insert("lgplv2", KAboutData::License_LGPL_V2);
+        ldict.insert("lgplv2+", KAboutData::License_LGPL_V2);
+        ldict.insert("bsd", KAboutData::License_BSD);
+        ldict.insert("artistic", KAboutData::License_Artistic);
+        ldict.insert("qpl", KAboutData::License_QPL);
+        ldict.insert("qplv1", KAboutData::License_QPL_V1_0);
+        ldict.insert("qplv10", KAboutData::License_QPL_V1_0);
+        ldict.insert("gplv3", KAboutData::License_GPL_V3);
+        ldict.insert("gplv3+", KAboutData::License_GPL_V3);
+        ldict.insert("lgplv3", KAboutData::License_LGPL_V3);
+        ldict.insert("lgplv3+", KAboutData::License_LGPL_V3);
+    }
+
+    // Normalize keyword.
+    QString keyword = rawKeyword;
+    keyword = keyword.toLower();
+    keyword.remove(QLatin1Char(' '));
+    keyword.remove(QLatin1Char('.'));
+
+    KAboutData::LicenseKey license = ldict.value(keyword.toLatin1(),
+                                                 KAboutData::License_Custom);
+    return KAboutLicense(license, 0);
+}
+
+
+class KAboutData::Private
+{
+public:
+    Private()
+        : customAuthorTextEnabled(false)
         {}
-    ~KAboutDataPrivate()
-        {
-//             delete programLogo;
-        }
-    const char *translatorName;
-    const char *translatorEmail;
-    const char *productName;
-//    QImage* programLogo;
+    QByteArray _appName;
+    KLocalizedString _programName;
+    KLocalizedString _shortDescription;
+    QByteArray _catalogName;
+    KLocalizedString _copyrightStatement;
+    KLocalizedString _otherText;
+    QString _homepageAddress;
+    QList<KAboutPerson> _authorList;
+    QList<KAboutPerson> _creditList;
+    QList<KAboutLicense> _licenseList;
+    KLocalizedString translatorName;
+    KLocalizedString translatorEmail;
+    QString productName;
+    QString programIconName;
+    QVariant programLogo;
+    KLocalizedString customAuthorPlainText, customAuthorRichText;
+    bool customAuthorTextEnabled;
+
+    QString organizationDomain;
+    QByteArray _ocsProviderUrl;
+
+    // Everything dr.konqi needs, we store as utf-8, so we
+    // can just give it a pointer, w/o any allocations.
+    QByteArray _translatedProgramName; // ### I don't see it ever being translated, and I did not change that
+    QByteArray _version;
+    QByteArray _bugEmailAddress;
 };
 
-} // namespace Piklab
 
-KAboutData::KAboutData( const char *appName,
-                        const char *programName,
-                        const char *version,
-                        const char *shortDescription,
-                        int licenseType,
-                        const char *copyrightStatement,
-                        const char *text,
-                        const char *homePageAddress,
-                        const char *bugsEmailAddress
-                        ) :
-  mProgramName( programName ),
-  mVersion( version ),
-  mShortDescription( shortDescription ),
-  mLicenseKey( licenseType ),
-  mCopyrightStatement( copyrightStatement ),
-  mOtherText( text ),
-  mHomepageAddress( homePageAddress ),
-  mBugEmailAddress( bugsEmailAddress ),
-  mLicenseText (0)
+KAboutData::KAboutData( const QByteArray &_appName,
+                        const QByteArray &_catalogName,
+                        const KLocalizedString &_programName,
+                        const QByteArray &_version,
+                        const KLocalizedString &_shortDescription,
+                        enum LicenseKey licenseType,
+                        const KLocalizedString &_copyrightStatement,
+                        const KLocalizedString &text,
+                        const QByteArray &homePageAddress,
+                        const QByteArray &bugsEmailAddress
+                      )
+  : d(new Private)
 {
-   d = new KAboutDataPrivate;
+    d->_appName = _appName;
+    int p = d->_appName.indexOf('/');
+    if (p >= 0) {
+        d->_appName = d->_appName.mid(p + 1);
+    }
 
-   if( appName ) {
-     const char *p = strrchr(appName, '/');
-     if( p )
-         mAppName = p+1;
-     else
-         mAppName = appName;
-   } else
-     mAppName = 0;
+    d->_catalogName = _catalogName;
+    d->_programName = _programName;
+    if (!d->_programName.isEmpty()) // KComponentData("klauncher") gives empty program name
+        d->_translatedProgramName = _programName.toString(0).toUtf8();
+    d->_version = _version;
+    d->_shortDescription = _shortDescription;
+    d->_licenseList.append(KAboutLicense(licenseType,this));
+    d->_copyrightStatement = _copyrightStatement;
+    d->_otherText = text;
+    d->_homepageAddress = QString::fromLatin1(homePageAddress);
+    d->_bugEmailAddress = bugsEmailAddress;
+
+    if (d->_homepageAddress.contains(QLatin1String("http://"))) {
+        const int dot = d->_homepageAddress.indexOf(QLatin1Char('.'));
+        if (dot >= 0) {
+            d->organizationDomain = d->_homepageAddress.mid(dot + 1);
+            const int slash = d->organizationDomain.indexOf(QLatin1Char('/'));
+            if (slash >= 0)
+                d->organizationDomain.truncate(slash);
+        }
+        else {
+            d->organizationDomain = QString::fromLatin1("kde.org");
+        }
+    }
+    else {
+        d->organizationDomain = QString::fromLatin1("kde.org");
+    }
 }
 
 KAboutData::~KAboutData()
 {
-    if (mLicenseKey == License_File)
-        delete [] mLicenseText;
     delete d;
-    d = NULL;
 }
 
-void
-KAboutData::addAuthor( const char *name, const char *task,
-                    const char *emailAddress, const char *webAddress )
+KAboutData::KAboutData(const KAboutData& other): d(new Private)
 {
-  mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress));
+    *d = *other.d;
+    QList<KAboutLicense>::iterator it = d->_licenseList.begin(), itEnd = d->_licenseList.end();
+    for ( ; it != itEnd; ++it) {
+        KAboutLicense& al = *it;
+        al.d.detach();
+        al.d->_aboutData = this;
+    }
 }
 
-void
-KAboutData::addCredit( const char *name, const char *task,
-                    const char *emailAddress, const char *webAddress )
+KAboutData &KAboutData::operator=(const KAboutData& other)
 {
-  mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress));
+    if (this != &other) {
+        *d = *other.d;
+        QList<KAboutLicense>::iterator it = d->_licenseList.begin(), itEnd = d->_licenseList.end();
+        for ( ; it != itEnd; ++it) {
+            KAboutLicense& al = *it;
+            al.d.detach();
+            al.d->_aboutData = this;
+        }
+    }
+    return *this;
 }
 
-void
-KAboutData::setTranslator( const char *name, const char *emailAddress)
+KAboutData &KAboutData::addAuthor( const KLocalizedString &name,
+                                   const KLocalizedString &task,
+                                   const QByteArray &emailAddress,
+                                   const QByteArray &webAddress )
 {
-  d->translatorName=name;
-  d->translatorEmail=emailAddress;
+  d->_authorList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  return *this;
 }
 
-void
-KAboutData::setLicenseText( const char *licenseText )
+KAboutData &KAboutData::addAuthor( const KLocalizedString &name,
+                                   const KLocalizedString &task,
+                                   const QByteArray &emailAddress,
+                                   const QByteArray &webAddress,
+                                   const QByteArray &ocsUsername )
 {
-  mLicenseText = licenseText;
-  mLicenseKey = License_Custom;
+  d->_authorList.append(KAboutPerson(name,task,emailAddress,webAddress,ocsUsername));
+  return *this;
 }
 
-void
-KAboutData::setLicenseTextFile( const QString &file )
+KAboutData &KAboutData::addCredit( const KLocalizedString &name,
+                                   const KLocalizedString &task,
+                                   const QByteArray &emailAddress,
+                                   const QByteArray &webAddress )
 {
-  mLicenseText = qstrdup(QFile::encodeName(file));
-  mLicenseKey = License_File;
+  d->_creditList.append(KAboutPerson(name,task,emailAddress,webAddress));
+  return *this;
 }
 
-void
-KAboutData::setAppName( const char *appName )
+KAboutData &KAboutData::addCredit( const KLocalizedString &name,
+                                   const KLocalizedString &task,
+                                   const QByteArray &emailAddress,
+                                   const QByteArray &webAddress,
+                                   const QByteArray &ocsUsername )
 {
-  mAppName = appName;
+  d->_creditList.append(KAboutPerson(name,task,emailAddress,webAddress,ocsUsername));
+  return *this;
 }
 
-void
-KAboutData::setProgramName( const char* programName )
+KAboutData &KAboutData::setTranslator( const KLocalizedString& name,
+                                       const KLocalizedString& emailAddress )
 {
-  mProgramName = programName;
+  d->translatorName = name;
+  d->translatorEmail = emailAddress;
+  return *this;
 }
 
-void
-KAboutData::setVersion( const char* version )
+KAboutData &KAboutData::setLicenseText( const KLocalizedString &licenseText )
 {
-  mVersion = version;
+    d->_licenseList[0] = KAboutLicense(licenseText,this);
+    return *this;
 }
 
-void
-KAboutData::setShortDescription( const char *shortDescription )
+KAboutData &KAboutData::addLicenseText( const KLocalizedString &licenseText )
 {
-  mShortDescription = shortDescription;
+    // if the default license is unknown, overwrite instead of append
+    KAboutLicense &firstLicense = d->_licenseList[0];
+    if (d->_licenseList.count() == 1 && firstLicense.d->_licenseKey == License_Unknown) {
+        firstLicense = KAboutLicense(licenseText,this);
+    } else {
+        d->_licenseList.append(KAboutLicense(licenseText,this));
+    }
+    return *this;
 }
 
-void
-KAboutData::setLicense( LicenseKey licenseKey)
+KAboutData &KAboutData::setLicenseTextFile( const QString &pathToFile )
 {
-  mLicenseKey = licenseKey;
+    d->_licenseList[0] = KAboutLicense(pathToFile,this);
+    return *this;
 }
 
-void
-KAboutData::setCopyrightStatement( const char *copyrightStatement )
+KAboutData &KAboutData::addLicenseTextFile( const QString &pathToFile )
 {
-  mCopyrightStatement = copyrightStatement;
+    // if the default license is unknown, overwrite instead of append
+    KAboutLicense &firstLicense = d->_licenseList[0];
+    if (d->_licenseList.count() == 1 && firstLicense.d->_licenseKey == License_Unknown) {
+        firstLicense = KAboutLicense(pathToFile,this);
+    } else {
+        d->_licenseList.append(KAboutLicense(pathToFile,this));
+    }
+    return *this;
 }
 
-void
-KAboutData::setOtherText( const char *otherText )
+KAboutData &KAboutData::setAppName( const QByteArray &_appName )
 {
-  mOtherText = otherText;
+  d->_appName = _appName;
+  return *this;
 }
 
-void
-KAboutData::setHomepage( const char *homepage )
+KAboutData &KAboutData::setProgramName( const KLocalizedString &_programName )
 {
-  mHomepageAddress = homepage;
+  d->_programName = _programName;
+  translateInternalProgramName();
+  return *this;
 }
 
-void
-KAboutData::setBugAddress( const char *bugAddress )
+KAboutData &KAboutData::setOcsProvider(const QByteArray &_ocsProviderUrl )
 {
-  mBugEmailAddress = bugAddress;
+    d->_ocsProviderUrl = _ocsProviderUrl;
+    return *this;
 }
 
-void
-KAboutData::setProductName( const char *productName )
+KAboutData &KAboutData::setVersion( const QByteArray &_version )
 {
-  d->productName = productName;
+  d->_version = _version;
+  return *this;
 }
 
-const char *
-KAboutData::appName() const
+KAboutData &KAboutData::setShortDescription( const KLocalizedString &_shortDescription )
 {
-   return mAppName;
+  d->_shortDescription = _shortDescription;
+  return *this;
 }
 
-const char *
-KAboutData::productName() const
+KAboutData &KAboutData::setCatalogName( const QByteArray &_catalogName )
 {
-   if (d->productName)
+  d->_catalogName = _catalogName;
+  return *this;
+}
+
+KAboutData &KAboutData::setLicense( LicenseKey licenseKey)
+{
+    d->_licenseList[0] = KAboutLicense(licenseKey,this);
+    return *this;
+}
+
+KAboutData &KAboutData::addLicense( LicenseKey licenseKey)
+{
+    // if the default license is unknown, overwrite instead of append
+    KAboutLicense &firstLicense = d->_licenseList[0];
+    if (d->_licenseList.count() == 1 && firstLicense.d->_licenseKey == License_Unknown) {
+        firstLicense = KAboutLicense(licenseKey,this);
+    } else {
+        d->_licenseList.append(KAboutLicense(licenseKey,this));
+    }
+    return *this;
+}
+
+KAboutData &KAboutData::setCopyrightStatement( const KLocalizedString &_copyrightStatement )
+{
+  d->_copyrightStatement = _copyrightStatement;
+  return *this;
+}
+
+KAboutData &KAboutData::setOtherText( const KLocalizedString &_otherText )
+{
+  d->_otherText = _otherText;
+  return *this;
+}
+
+KAboutData &KAboutData::setHomepage( const QByteArray &_homepage )
+{
+  d->_homepageAddress = QString::fromLatin1(_homepage);
+  return *this;
+}
+
+KAboutData &KAboutData::setBugAddress( const QByteArray &_bugAddress )
+{
+  d->_bugEmailAddress = _bugAddress;
+  return *this;
+}
+
+KAboutData &KAboutData::setOrganizationDomain( const QByteArray &domain )
+{
+  d->organizationDomain = QString::fromLatin1(domain);
+  return *this;
+}
+
+KAboutData &KAboutData::setProductName( const QByteArray &_productName )
+{
+  d->productName = QString::fromUtf8(_productName);
+  return *this;
+}
+
+QString KAboutData::appName() const
+{
+  return QString::fromUtf8(d->_appName);
+}
+
+QString KAboutData::productName() const
+{
+   if (!d->productName.isEmpty())
       return d->productName;
-   else
-      return appName();
+   return appName();
 }
 
-QString
-KAboutData::programName() const
+QString KAboutData::programName() const
 {
-   if (mProgramName && *mProgramName)
-      return i18n(mProgramName);
-   else
-      return QString::null;
+   if (!d->_programName.isEmpty())
+      return d->_programName.toString();
+   return QString();
 }
-/*
-QImage
-KAboutData::programLogo() const
+
+/// @internal
+/// Return the program name. It is always pre-allocated.
+/// Needed for KCrash in particular.
+const char* KAboutData::internalProgramName() const
 {
-    return d->programLogo ? (*d->programLogo) : QImage();
+   return d->_translatedProgramName.constData();
 }
 
-void
-KAboutData::setProgramLogo(const QImage& image)
+/// @internal
+/// KCrash should call as few things as possible and should avoid e.g. malloc()
+/// because it may deadlock. Since i18n() needs it, when KLocale is available
+/// the i18n() call will be done here in advance.
+void KAboutData::translateInternalProgramName() const
 {
-    if (!d->programLogo)
-       d->programLogo = new QImage( image );
-    else
-       *d->programLogo = image;
+  d->_translatedProgramName.clear();
+  if( KGlobal::locale())
+      d->_translatedProgramName = programName().toUtf8();
 }
-*/
-QString
-KAboutData::version() const
+
+QString KAboutData::programIconName() const
 {
-   return QString::fromLatin1(mVersion);
+    return d->programIconName.isEmpty() ? appName() : d->programIconName;
 }
 
-QString
-KAboutData::shortDescription() const
+KAboutData &KAboutData::setProgramIconName( const QString &iconName )
 {
-   if (mShortDescription && *mShortDescription)
-      return i18n(mShortDescription);
-   else
-      return QString::null;
+    d->programIconName = iconName;
+    return *this;
 }
 
-QString
-KAboutData::homepage() const
+QVariant KAboutData::programLogo() const
 {
-   return QString::fromLatin1(mHomepageAddress);
+    return d->programLogo;
 }
 
-QString
-KAboutData::bugAddress() const
+KAboutData &KAboutData::setProgramLogo(const QVariant& image)
 {
-   return QString::fromLatin1(mBugEmailAddress);
+    d->programLogo = image ;
+    return *this;
 }
 
-const QValueList<KAboutPerson>
-KAboutData::authors() const
+QString KAboutData::ocsProviderUrl() const
 {
-   return mAuthorList;
+    if( !d->_ocsProviderUrl.isEmpty() )
+        return QString::fromUtf8( d->_ocsProviderUrl );
+    return QString();
 }
 
-const QValueList<KAboutPerson>
-KAboutData::credits() const
+QString KAboutData::version() const
 {
-   return mCreditList;
+   return QString::fromUtf8(d->_version);
 }
 
-const QValueList<KAboutTranslator>
-KAboutData::translators() const
+/// @internal
+/// Return the untranslated and uninterpreted (to UTF8) string
+/// for the version information. Used in particular for KCrash.
+const char* KAboutData::internalVersion() const
 {
-    QValueList<KAboutTranslator> personList;
+   return d->_version.constData();
+}
 
-    if(d->translatorName == 0)
-        return personList;
+QString KAboutData::shortDescription() const
+{
+   if (!d->_shortDescription.isEmpty())
+      return d->_shortDescription.toString();
+   return QString();
+}
 
-    QStringList nameList;
-    QStringList emailList;
+QString KAboutData::catalogName() const
+{
+   if (!d->_catalogName.isEmpty())
+     return QString::fromUtf8(d->_catalogName);
+   // Fallback to appname for catalog name if empty.
+   return QString::fromUtf8(d->_appName);
+}
 
-    QString names = i18n(d->translatorName);
-    if(names != QString::fromUtf8(d->translatorName))
-    {
-#if QT_VERSION < 0x040000
-        nameList = QStringList::split(',',names);
-#else
-        nameList = names.split(',', QString::SkipEmptyParts);
-#endif
-    }
+QString KAboutData::homepage() const
+{
+   return d->_homepageAddress;
+}
 
+QString KAboutData::bugAddress() const
+{
+   return QString::fromUtf8(d->_bugEmailAddress);
+}
 
-    if(d->translatorEmail)
-    {
-        QString emails = i18n(d->translatorEmail);
+QString KAboutData::organizationDomain() const
+{
+    return d->organizationDomain;
+}
 
-        if(emails != QString::fromUtf8(d->translatorEmail))
-        {
-#if QT_VERSION < 0x040000
-            emailList = QStringList::split(',',emails,true);
-#else
-            emailList = emails.split(',');
-#endif
-        }
+
+/// @internal
+/// Return the untranslated and uninterpreted (to UTF8) string
+/// for the bug mail address. Used in particular for KCrash.
+const char* KAboutData::internalBugAddress() const
+{
+   if (d->_bugEmailAddress.isEmpty())
+      return 0;
+   return d->_bugEmailAddress.constData();
+}
+
+QList<KAboutPerson> KAboutData::authors() const
+{
+   return d->_authorList;
+}
+
+QList<KAboutPerson> KAboutData::credits() const
+{
+   return d->_creditList;
+}
+
+#define NAME_OF_TRANSLATORS "Your names"
+#define EMAIL_OF_TRANSLATORS "Your emails"
+QList<KAboutPerson> KAboutData::translators() const
+{
+    QList<KAboutPerson> personList;
+
+    KLocale *tmpLocale = NULL;
+    if (KGlobal::locale()) {
+        // There could be many catalogs loaded into the global locale,
+        // e.g. in systemsettings. The tmp locale is needed to make sure we
+        // use the translators name from this aboutdata's catalog, rather than
+        // from any other loaded catalog.
+        tmpLocale = new KLocale(*KGlobal::locale());
+        tmpLocale->setActiveCatalog(catalogName());
     }
 
+    QString translatorName;
+    if (!d->translatorName.isEmpty()) {
+        translatorName = d->translatorName.toString();
+    }
+    else {
+        translatorName = ki18nc("NAME OF TRANSLATORS", NAME_OF_TRANSLATORS).toString(tmpLocale);
+    }
 
-    QStringList::Iterator nit;
-    QStringList::Iterator eit=emailList.begin();
+    QString translatorEmail;
+    if (!d->translatorEmail.isEmpty()) {
+        translatorEmail = d->translatorEmail.toString();
+    }
+    else {
+        translatorEmail = ki18nc("EMAIL OF TRANSLATORS", EMAIL_OF_TRANSLATORS).toString(tmpLocale);
+    }
 
-    for(nit = nameList.begin(); nit != nameList.end(); ++nit)
+    delete tmpLocale;
+
+    if ( translatorName.isEmpty() || translatorName == QString::fromUtf8( NAME_OF_TRANSLATORS ) )
+        return personList;
+
+    const QStringList nameList(translatorName.split(QString(QLatin1Char(','))));
+
+    QStringList emailList;
+    if( !translatorEmail.isEmpty() && translatorEmail != QString::fromUtf8( EMAIL_OF_TRANSLATORS ) )
     {
+       emailList = translatorEmail.split(QString(QLatin1Char(',')), QString::KeepEmptyParts);
+    }
+
+    QStringList::const_iterator nit;
+    QStringList::const_iterator eit = emailList.constBegin();
+
+    for( nit = nameList.constBegin(); nit != nameList.constEnd(); ++nit )
+    {
         QString email;
-        if(eit != emailList.end())
+        if ( eit != emailList.constEnd() )
         {
-            email=*eit;
+            email = *eit;
             ++eit;
         }
 
-        QString name=*nit;
-
-#if QT_VERSION < 0x040000
-        personList.append(KAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
-#else
-        personList.append(KAboutTranslator(name.trimmed(), email.trimmed()));
-#endif
+        personList.append( KAboutPerson( (*nit).trimmed(), email.trimmed() ) );
     }
 
     return personList;
 }
 
-QString
-KAboutData::aboutTranslationTeam()
+QString KAboutData::aboutTranslationTeam()
 {
-    return i18n("replace this with information about your translation team",
+    return i18nc("replace this with information about your translation team",
             "<p>KDE is translated into many languages thanks to the work "
             "of the translation teams all over the world.</p>"
             "<p>For more information on KDE internationalization "
-            "visit http://i18n.kde.org</p>");
+            "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+            );
 }
 
-QString
-KAboutData::otherText() const
+QString KAboutData::otherText() const
 {
-   if (mOtherText && *mOtherText)
-      return i18n(mOtherText);
-   else
-      return QString::null;
+   if (!d->_otherText.isEmpty())
+      return d->_otherText.toString();
+   return QString();
 }
 
+QString KAboutData::license() const
+{
+    return d->_licenseList.at(0).text();
+}
 
-QString
-KAboutData::license() const
+QString KAboutData::licenseName( NameFormat formatName ) const
 {
-  QString result;
-  if (!copyrightStatement().isEmpty())
-    result = copyrightStatement() + "\n\n";
+    return d->_licenseList.at(0).name(formatName);
+}
 
-  QString l;
-  QString f;
-  switch ( mLicenseKey )
-  {
-    case License_File:
-       f = QFile::decodeName(mLicenseText);
-       break;
-    case License_GPL_V2:
-       l = "GPL v2";
-       f = locate("data", "LICENSES/GPL_V2");
-       break;
-    case License_LGPL_V2:
-       l = "LGPL v2";
-       f = locate("data", "LICENSES/LGPL_V2");
-       break;
-    case License_BSD:
-       l = "BSD License";
-       f = locate("data", "LICENSES/BSD");
-       break;
-    case License_Artistic:
-       l = "Artistic License";
-       f = locate("data", "LICENSES/ARTISTIC");
-       break;
-    case License_QPL_V1_0:
-       l = "QPL v1.0";
-       f = locate("data", "LICENSES/QPL_V1.0");
-       break;
-    case License_Custom:
-       if (mLicenseText && *mLicenseText)
-          return( i18n(mLicenseText) );
-       // fall through
-    default:
-       result += i18n("No licensing terms for this program have been specified.\n"
-                   "Please check the documentation or the source for any\n"
-                   "licensing terms.\n");
-       return result;
-      }
+QList<KAboutLicense> KAboutData::licenses() const
+{
+    return d->_licenseList;
+}
 
-  if (!l.isEmpty())
-     result += i18n("This program is distributed under the terms of the %1.").arg( l );
+QString KAboutData::copyrightStatement() const
+{
+  if (!d->_copyrightStatement.isEmpty())
+    return d->_copyrightStatement.toString();
+  return QString();
+}
 
-  if (!f.isEmpty())
-  {
-     QFile file(f);
-#if QT_VERSION < 0x040000
-     if (file.open(IO_ReadOnly))
-#else
-     if (file.open(QIODevice::ReadOnly))
-#endif
-     {
-        result += '\n';
-        result += '\n';
-        QTextStream str(&file);
-#if QT_VERSION < 0x040000
-        result += str.read();
-#else
-        result += str.readAll();
-#endif
-     }
-  }
+QString KAboutData::customAuthorPlainText() const
+{
+  if (!d->customAuthorPlainText.isEmpty())
+    return d->customAuthorPlainText.toString();
+  return QString();
+}
 
-  return result;
+QString KAboutData::customAuthorRichText() const
+{
+  if (!d->customAuthorRichText.isEmpty())
+    return d->customAuthorRichText.toString();
+  return QString();
 }
 
-QString
-KAboutData::copyrightStatement() const
+bool KAboutData::customAuthorTextEnabled() const
 {
-  if (mCopyrightStatement && *mCopyrightStatement)
-     return i18n(mCopyrightStatement);
-  else
-     return QString::null;
+  return d->customAuthorTextEnabled;
 }
+
+KAboutData &KAboutData::setCustomAuthorText( const KLocalizedString &plainText,
+                                             const KLocalizedString &richText )
+{
+  d->customAuthorPlainText = plainText;
+  d->customAuthorRichText = richText;
+
+  d->customAuthorTextEnabled = true;
+
+  return *this;
+}
+
+KAboutData &KAboutData::unsetCustomAuthorText()
+{
+  d->customAuthorPlainText = KLocalizedString();
+  d->customAuthorRichText = KLocalizedString();
+
+  d->customAuthorTextEnabled = false;
+
+  return *this;
+}
+

Modified: trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.h
===================================================================
--- trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.h	2012-06-05 14:07:38 UTC (rev 2909)
+++ trunk/piklab_kde4/src/common/nokde/nokde_kaboutdata.h	2012-06-10 00:47:55 UTC (rev 2910)
@@ -1,8 +1,8 @@
-// modified from KDE 3.4 for Windows port (Nicolas Hadacek)
-
 /*
  * This file is part of the KDE Libraries
  * Copyright (C) 2000 Espen Sand (es...@kd...)
+ * Copyright (C) 2008 Friedrich W. H. Kossebau <kos...@kd...>
+ * Copyright (C) 2010 Teo Mrnjavac <te...@kd...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -16,165 +16,160 @@
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  *
  */
 
-#include <qglobal.h>
-#if QT_VERSION < 0x040000
-#  include <qvaluelist.h>
-#else
-#  include <Q3ValueList>
-#  define QValueList Q3ValueList
-#  include <QStringList>
-#endif
-#include <qstring.h>
+#ifndef KABOUTDATA_H
+#define KABOUTDATA_H
 
-#include "nokde_klocale.h"
+//#include <kdecore_export.h>
+//#include "klocale.h"
+#include "common/common/global.h"
+// Qt
+#include <QtCore/QString>
+#include <QtCore/QSharedDataPointer>
 
-#ifndef _KABOUTDATA_H_
-#define _KABOUTDATA_H_
+template <class T> class QList;
+class QVariant;
+class KAboutData;
 
-namespace Piklab
-{
-
-class KAboutPersonPrivate;
-class KAboutDataPrivate;
-
 /**
- * This structure is used to store information about a person or developer.
+ * This class is used to store information about a person or developer.
  * It can store the person's name, a task, an email address and a
  * link to a home page. This class is intended for use in the
  * KAboutData class, but it can be used elsewhere as well.
  * Normally you should at least define the person's name.
+ * Creating a KAboutPerson object by yourself is relatively useless,
+ * but the KAboutData methods KAboutData::authors() and KAboutData::credits()
+ * return lists of KAboutPerson data objects which you can examine.
  *
- * Example Usage within a main():
+ * Example usage within a main(), retrieving the list of people involved
+ * with a program and re-using data from one of them:
  *
- * KAboutData about("khello", I18N_NOOP("KHello"), "0.1",
- *                   I18N_NOOP("A KDE version of Hello, world!"),
+ * @code
+ * KAboutData about("khello", "khello", ki18n("KHello"), "0.1",
+ *                   ki18n("A KDE version of Hello, world!"),
  *                   KAboutData::License_LGPL,
- *                   I18N_NOOP("Copyright (c) 2003 Developer"));
+ *                   ki18n("Copyright (C) 2003 Developer"));
  *
- *   about.addAuthor("Joe Developer", I18N_NOOP("developer"), "jo...@ho...", 0);
- *   about.addCredit("Joe User", I18N_NOOP("A lot of bug reports"),
- *                   "joe...@ho...", 0);
- *   KCmdLineArgs::init(argc, argv, &about);
+ * about.addAuthor(ki18n("Joe Developer"), ki18n("developer"), "jo...@ho...", 0);
+ * QList<KAboutPerson> people = about.authors();
+ * about.addCredit(people[0].name(), people[0].task());
+ * @endcode
+ *
+ * @note Instead of the more usual i18n calls, for translatable text the ki18n
+ * calls are used to produce KLocalizedStrings, which can delay the translation
+ * lookup. This is necessary because the translation catalogs are usually not
+ * yet initialized at the point where KAboutData is constructed.
+ *
+ * @bc KDE4
  */
 class KDECORE_EXPORT KAboutPerson
 {
+    friend class KAboutData;
 public:
     /**
      * Convenience constructor
      *
      * @param name The name of the person.
      *
-     * @param task The task of this person. This string should be
-     *              marked for translation, e.g.
-     *              I18N_NOOP("Task description....")
+     * @param task The task of this person.
      *
      * @param emailAddress The email address of the person.
      *
      * @param webAddress Home page of the person.
      */
-    KAboutPerson( const char *name, const char *task,
-                  const char *emailAddress, const char *webAddress )
-    {
-      mName = name;
-      mTask = task;
-      mEmailAddress = emailAddress;
-      mWebAddress = webAddress;
-    }
+    explicit KAboutPerson( const KLocalizedString &name,
+                           const KLocalizedString &task = KLocalizedString(),
+                           const QByteArray &emailAddress = QByteArray(),
+                           const QByteArray &webAddress = QByteArray() );
+
     /**
-     * @internal
-     * Don't use. Required by QValueList
+     * Convenience constructor with Open Collaboration Services data
+     *
+     * @param name The name of the person.
+     *
+     * @param task The task of this person.
+     *
+     * @param emailAddress The email address of the person.
+     *
+     * @param webAddress Home page of the person.
+     *
+     * @param ocsUsername Open Collaboration Services username of the person.
      */
-    KAboutPerson() {}
+    explicit KAboutPerson( const KLocalizedString &name,
+                           const KLocalizedString &task,
+                           const QByteArray &emailAddress,
+                           const QByteArray &webAddress,
+                           const QByteArray &ocsUsername ); //KDE5: merge into main ctor
 
     /**
+     * Copy constructor.  Performs a deep copy.
+     * @param other object to copy
+     */
+    KAboutPerson(const KAboutPerson& other);
+
+    ~KAboutPerson();
+
+    /**
+     * Assignment operator.  Performs a deep copy.
+     * @param other object to copy
+     */
+    KAboutPerson& operator=(const KAboutPerson& other);
+
+
+    /**
      * The person's name
-     * @return the person's name (can be QString::null, if it has been
-     *           constructed with a null name)
+     * @return the person's name (can be QString(), if it has been
+     *           constructed with an empty name)
      */
     QString name() const;
 
     /**
      * The person's task
-     * @return the person's task (can be QString::null, if it has been
-     *           constructed with a null task)
+     * @return the person's task (can be QString(), if it has been
+     *           constructed with an empty task)
      */
     QString task() const;
 
     /**
      * The person's email address
-     * @return the person's email address (can be QString::null, if it has been
-     *           constructed with a null email)
+     * @return the person's email address (can be QString(), if it has been
+     *           constructed with an empty email)
      */
     QString emailAddress() const;
 
     /**
      * The home page or a relevant link
-     * @return the persons home page (can be QString::null, if it has been
-     *           constructed with a null home page)
+     * @return the persons home page (can be QString(), if it has been
+     *           constructed with an empty home page)
      */
     QString webAddress() const;
 
-private:
-    const char *mName;
-    const char *mTask;
-    const char *mEmailAddress;
-    const char *mWebAddress;
-
-    KAboutPersonPrivate *d;
-};
-
-class KAboutTranslatorPrivate;
-/**
- * This structure is used to store information about a translator.
- * It can store the translator's name and an email address.
- * This class is intended for use in the KAboutData class,
- * but it can be used elsewhere as well.
- * Normally you should at least define the translator's name.
- *
- * It's not possible to use KAboutPerson for this, because
- * KAboutPerson stores internally only const char* pointers, but the
- * translator information is generated dynamically from the translation
- * of a dummy string.
-*/
-class KDECORE_EXPORT KAboutTranslator
-{
-public:
     /**
-     * Convenience constructor
-     *
-     * @param name The name of the person.
-     *
-     * @param emailAddress The email address of the person.
+     * The person's Open Collaboration Services username
+     * @return the persons OCS username (can be QString(), if it has been
+     *           constructed with an empty username)
      */
-    KAboutTranslator(const QString & name=QString::null,
-                     const QString & emailAddress=QString::null);
+    QString ocsUsername() const;
 
+private:
     /**
-     * The translator's name
-     * @return the translators's name (can be QString::null, if it has been
-     *           constructed with a null name)
+     * @internal Used by KAboutData to construct translator data.
      */
-    QString name() const;
+    explicit KAboutPerson( const QString &name, const QString &email );
 
-    /**
-     * The translator's email
-     * @return the translator's email address (can be QString::null, if it has been
-     *           constructed with a null email)
-     */
-    QString emailAddress() const;
-
-private:
-    QString mName;
-    QString mEmail;
-    KAboutTranslatorPrivate* d;
+    class Private;
+    Private *const d;
 };
 
+class KAboutLicense;
 
+// KDE5: refactor together with KComponentData.
+// Like changing all property names which contain Program or App.
+
 /**
  * This class is used to store information about a program. It can store
  * such values as version number, program name, home page, email address
@@ -184,7 +179,13 @@
  * Currently, the values set here are shown by the "About" box
  * (see KAboutDialog), used by the bug report dialog (see KBugReport),
  * and by the help shown on command line (see KCmdLineArgs).
+ * They are also used for the icon and the name of the program's windows.
  *
+ * @note Instead of the more usual i18n calls, for translatable text the ki18n
+ * calls are used to produce KLocalizedStrings, which can delay the translation
+ * lookup. This is necessary because the translation catalogs are usually not
+ * yet initialized at the point where KAboutData is constructed.
+ *
  * @short Holds information needed by the "About" box and other
  * classes.
  * @author Espen Sand (es...@kd...), David Faure (fa...@kd...)
@@ -193,9 +194,9 @@
 {
   public:
   /**
-   * Descibes the license of the software.
+   * Describes the license of the software.
    */
-    enum LicenseKey
+    enum LicenseKey // KDE5: move to KAboutLicense, cut License_ prefix
     {
       License_Custom = -2,
       License_File = -1,
@@ -207,113 +208,215 @@
       License_BSD  = 3,
       License_Artistic = 4,
       License_QPL = 5,
-      License_QPL_V1_0 = 5
+      License_QPL_V1_0 = 5,
+      License_GPL_V3 = 6,
+      License_LGPL_V3 = 7
     };
 
+  /**
+   * Format of the license name.
+   */
+    enum NameFormat // KDE5: move to KAboutLicense
+    {
+        ShortName,
+        FullName
+    };
+
   public:
     /**
      * Constructor.
      *
      * @param appName The program name used internally. Example: "kedit"
      *
+     * @param catalogName The translation catalog name; if null or empty, the
+     *        @p appName will be used. You may want the catalog name to
+     *        differ from program name, for example, when you want to group
+     *        translations of several smaller utilities under the same catalog.
+     *
      * @param programName A displayable program name string. This string
-     *        should be marked for translation. Example: I18N_NOOP("KEdit")
+     *        should be marked for translation. Example: ki18n("KEdit")
      *
      * @param version The program version string.
      *
      * @param shortDescription A...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2909] trunk/www/devices

From: <az...@us...> - 2012-06-05 14:08:16

Revision: 2909
          http://piklab.svn.sourceforge.net/piklab/?rev=2909&view=rev
Author:   azhyd
Date:     2012-06-05 14:07:38 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/devices/10F200_10F200_extended.png
    trunk/www/devices/10F200_pins_graph.png
    trunk/www/devices/10F202_10F202_extended.png
    trunk/www/devices/10F202_pins_graph.png
    trunk/www/devices/10F204_10F204_extended.png
    trunk/www/devices/10F204_pins_graph.png
    trunk/www/devices/10F206_10F206_extended.png
    trunk/www/devices/10F206_pins_graph.png
    trunk/www/devices/10F220_10F220_extended.png
    trunk/www/devices/10F220_pins_graph.png
    trunk/www/devices/10F222_10F222_extended.png
    trunk/www/devices/10F222_pins_graph.png
    trunk/www/devices/12C508A_12C508A_extended.png
    trunk/www/devices/12C508A_pins_graph.png
    trunk/www/devices/12C508_12C508_extended.png
    trunk/www/devices/12C508_12C508_industrial.png
    trunk/www/devices/12C508_pins_graph.png
    trunk/www/devices/12C509A_12C509A_extended.png
    trunk/www/devices/12C509A_pins_graph.png
    trunk/www/devices/12C509_12C509_extended.png
    trunk/www/devices/12C509_12C509_industrial.png
    trunk/www/devices/12C509_pins_graph.png
    trunk/www/devices/12C671.htm
    trunk/www/devices/12C671_12C671_commercial.png
    trunk/www/devices/12C671_12C671_extended.png
    trunk/www/devices/12C671_12LC671_commercial.png
    trunk/www/devices/12C671_pins_graph.png
    trunk/www/devices/12C672.htm
    trunk/www/devices/12C672_12C672_commercial.png
    trunk/www/devices/12C672_12C672_extended.png
    trunk/www/devices/12C672_12LC672_commercial.png
    trunk/www/devices/12C672_pins_graph.png
    trunk/www/devices/12CE518_12CE518_extended.png
    trunk/www/devices/12CE518_pins_graph.png
    trunk/www/devices/12CE519_12CE519_extended.png
    trunk/www/devices/12CE519_pins_graph.png
    trunk/www/devices/12CE673.htm
    trunk/www/devices/12CE673_12CE673_commercial.png
    trunk/www/devices/12CE673_12CE673_extended.png
    trunk/www/devices/12CE673_12LCE673_commercial.png
    trunk/www/devices/12CE673_pins_graph.png
    trunk/www/devices/12CE674.htm
    trunk/www/devices/12CE674_12CE674_commercial.png
    trunk/www/devices/12CE674_12CE674_extended.png
    trunk/www/devices/12CE674_12LCE674_commercial.png
    trunk/www/devices/12CE674_pins_graph.png
    trunk/www/devices/12CR509A_12CR509A_extended.png
    trunk/www/devices/12CR509A_pins_graph.png
    trunk/www/devices/12F508_12F508_extended.png
    trunk/www/devices/12F508_pins_graph.png
    trunk/www/devices/12F509_12F509_extended.png
    trunk/www/devices/12F509_pins_graph.png
    trunk/www/devices/12F510_12F510_extended.png
    trunk/www/devices/12F510_pins_graph.png
    trunk/www/devices/12F519_12F519_extended.png
    trunk/www/devices/12F519_pins_graph.png
    trunk/www/devices/12F609_12F609_extended.png
    trunk/www/devices/12F609_12HV609_extended.png
    trunk/www/devices/12F609_pins_graph.png
    trunk/www/devices/12F615_12F615_extended.png
    trunk/www/devices/12F615_12HV615_extended.png
    trunk/www/devices/12F615_pins_graph.png
    trunk/www/devices/12F629_12F629_commercial.png
    trunk/www/devices/12F629_12F629_extended.png
    trunk/www/devices/12F629_pins_graph.png
    trunk/www/devices/12F635_12F635_extended.png
    trunk/www/devices/12F635_pins_graph.png
    trunk/www/devices/12F675_12F675_commercial.png
    trunk/www/devices/12F675_12F675_extended.png
    trunk/www/devices/12F675_pins_graph.png
    trunk/www/devices/12F683_12F683_extended.png
    trunk/www/devices/12F683_pins_graph.png
    trunk/www/devices/14000_14000_industrial.png
    trunk/www/devices/14000_pins_graph.png
    trunk/www/devices/16C432_16C432_industrial.png
    trunk/www/devices/16C432_pins_graph.png
    trunk/www/devices/16C433_16C433_industrial.png
    trunk/www/devices/16C433_pins_graph.png
    trunk/www/devices/16C505.htm
    trunk/www/devices/16C505_16C505_commercial.png
    trunk/www/devices/16C505_16C505_extended.png
    trunk/www/devices/16C505_16LC505_industrial.png
    trunk/www/devices/16C505_pins_graph.png
    trunk/www/devices/16C52_16C52_industrial.png
    trunk/www/devices/16C52_pins_graph.png
    trunk/www/devices/16C54A.htm
    trunk/www/devices/16C54A_16C54A_extended.png
    trunk/www/devices/16C54A_16C54A_industrial.png
    trunk/www/devices/16C54A_16LC54A_extended.png
    trunk/www/devices/16C54A_16LV54A_industrial.png
    trunk/www/devices/16C54A_pins_graph.png
    trunk/www/devices/16C54B.htm
    trunk/www/devices/16C54B_16C54B_extended.png
    trunk/www/devices/16C54B_16C54B_industrial.png
    trunk/www/devices/16C54B_16LC54B_industrial.png
    trunk/www/devices/16C54B_pins_graph.png
    trunk/www/devices/16C54C.htm
    trunk/www/devices/16C54C_16C54C_extended.png
    trunk/www/devices/16C54C_16C54C_industrial.png
    trunk/www/devices/16C54C_16LC54C_industrial.png
    trunk/www/devices/16C54C_pins_graph.png
    trunk/www/devices/16C54_16C54_extended.png
    trunk/www/devices/16C54_16C54_industrial.png
    trunk/www/devices/16C54_pins_graph.png
    trunk/www/devices/16C554.htm
    trunk/www/devices/16C554_16C554_commercial.png
    trunk/www/devices/16C554_16C554_extended.png
    trunk/www/devices/16C554_16LC554_commercial.png
    trunk/www/devices/16C554_16LC554_industrial.png
    trunk/www/devices/16C554_pins_graph.png
    trunk/www/devices/16C557.htm
    trunk/www/devices/16C557_16C557_commercial.png
    trunk/www/devices/16C557_16C557_extended.png
    trunk/www/devices/16C557_16LC557_commercial.png
    trunk/www/devices/16C557_16LC557_industrial.png
    trunk/www/devices/16C557_pins_graph.png
    trunk/www/devices/16C558.htm
    trunk/www/devices/16C558_16C558_commercial.png
    trunk/www/devices/16C558_16C558_extended.png
    trunk/www/devices/16C558_16LC558_commercial.png
    trunk/www/devices/16C558_16LC558_industrial.png
    trunk/www/devices/16C558_pins_graph.png
    trunk/www/devices/16C55A.htm
    trunk/www/devices/16C55A_16C55A_extended.png
    trunk/www/devices/16C55A_16C55A_industrial.png
    trunk/www/devices/16C55A_16LC55A_industrial.png
    trunk/www/devices/16C55A_pins_graph.png
    trunk/www/devices/16C55_16C55_extended.png
    trunk/www/devices/16C55_16C55_industrial.png
    trunk/www/devices/16C55_pins_graph.png
    trunk/www/devices/16C56A.htm
    trunk/www/devices/16C56A_16C56A_extended.png
    trunk/www/devices/16C56A_16C56A_industrial.png
    trunk/www/devices/16C56A_16LC56A_industrial.png
    trunk/www/devices/16C56A_pins_graph.png
    trunk/www/devices/16C56_16C56_extended.png
    trunk/www/devices/16C56_16C56_industrial.png
    trunk/www/devices/16C56_pins_graph.png
    trunk/www/devices/16C57C.htm
    trunk/www/devices/16C57C_16C57C_extended.png
    trunk/www/devices/16C57C_16C57C_industrial.png
    trunk/www/devices/16C57C_16LC57C_industrial.png
    trunk/www/devices/16C57C_pins_graph.png
    trunk/www/devices/16C57_16C57_extended.png
    trunk/www/devices/16C57_16C57_industrial.png
    trunk/www/devices/16C57_pins_graph.png
    trunk/www/devices/16C58A.htm
    trunk/www/devices/16C58A_16C58A_extended.png
    trunk/www/devices/16C58A_16C58A_industrial.png
    trunk/www/devices/16C58A_16LC58A_extended.png
    trunk/www/devices/16C58A_16LV58A_industrial.png
    trunk/www/devices/16C58A_pins_graph.png
    trunk/www/devices/16C58B.htm
    trunk/www/devices/16C58B_16C58B_extended.png
    trunk/www/devices/16C58B_16C58B_industrial.png
    trunk/www/devices/16C58B_16LC58B_industrial.png
    trunk/www/devices/16C58B_pins_graph.png
    trunk/www/devices/16C61.htm
    trunk/www/devices/16C61_16C61_extended.png
    trunk/www/devices/16C61_16LC61_industrial.png
    trunk/www/devices/16C61_pins_graph.png
    trunk/www/devices/16C620.htm
    trunk/www/devices/16C620A.htm
    trunk/www/devices/16C620A_16C620A_commercial.png
    trunk/www/devices/16C620A_16C620A_extended.png
    trunk/www/devices/16C620A_16LC620A_commercial.png
    trunk/www/devices/16C620A_16LC620A_industrial.png
    trunk/www/devices/16C620A_pins_graph.png
    trunk/www/devices/16C620_16C620_commercial.png
    trunk/www/devices/16C620_16C620_extended.png
    trunk/www/devices/16C620_16LC620_industrial.png
    trunk/www/devices/16C620_pins_graph.png
    trunk/www/devices/16C621.htm
    trunk/www/devices/16C621A.htm
    trunk/www/devices/16C621A_16C621A_commercial.png
    trunk/www/devices/16C621A_16C621A_extended.png
    trunk/www/devices/16C621A_16LC621A_commercial.png
    trunk/www/devices/16C621A_16LC621A_industrial.png
    trunk/www/devices/16C621A_pins_graph.png
    trunk/www/devices/16C621_16C621_commercial.png
    trunk/www/devices/16C621_16C621_extended.png
    trunk/www/devices/16C621_16LC621_industrial.png
    trunk/www/devices/16C621_pins_graph.png
    trunk/www/devices/16C622.htm
    trunk/www/devices/16C622A.htm
    trunk/www/devices/16C622A_16C622A_commercial.png
    trunk/www/devices/16C622A_16C622A_extended.png
    trunk/www/devices/16C622A_16LC622A_commercial.png
    trunk/www/devices/16C622A_16LC622A_industrial.png
    trunk/www/devices/16C622A_pins_graph.png
    trunk/www/devices/16C622_16C622_commercial.png
    trunk/www/devices/16C622_16C622_extended.png
    trunk/www/devices/16C622_16LC622_industrial.png
    trunk/www/devices/16C622_pins_graph.png
    trunk/www/devices/16C62A.htm
    trunk/www/devices/16C62A_16C62A_extended.png
    trunk/www/devices/16C62A_16LC62A_industrial.png
    trunk/www/devices/16C62A_pins_graph.png
    trunk/www/devices/16C62B.htm
    trunk/www/devices/16C62B_16C62B_extended.png
    trunk/www/devices/16C62B_16LC62B_industrial.png
    trunk/www/devices/16C62B_pins_graph.png
    trunk/www/devices/16C62_16C62_industrial.png
    trunk/www/devices/16C62_16LC62_industrial.png
    trunk/www/devices/16C62_pins_graph.png
    trunk/www/devices/16C63.htm
    trunk/www/devices/16C63A.htm
    trunk/www/devices/16C63A_16C63A_extended.png
    trunk/www/devices/16C63A_16LC63A_industrial.png
    trunk/www/devices/16C63A_pins_graph.png
    trunk/www/devices/16C63_16C63_extended.png
    trunk/www/devices/16C63_16LC63_industrial.png
    trunk/www/devices/16C63_pins_graph.png
    trunk/www/devices/16C641.htm
    trunk/www/devices/16C641_16C641_extended.png
    trunk/www/devices/16C641_16LC641_industrial.png
    trunk/www/devices/16C641_pins_graph.png
    trunk/www/devices/16C642.htm
    trunk/www/devices/16C642_16C642_extended.png
    trunk/www/devices/16C642_16LC642_industrial.png
    trunk/www/devices/16C642_pins_graph.png
    trunk/www/devices/16C64A.htm
    trunk/www/devices/16C64A_16C64A_extended.png
    trunk/www/devices/16C64A_16LC64A_industrial.png
    trunk/www/devices/16C64A_pins_graph.png
    trunk/www/devices/16C64_16C64_industrial.png
    trunk/www/devices/16C64_16LC64_industrial.png
    trunk/www/devices/16C64_pins_graph.png
    trunk/www/devices/16C65A.htm
    trunk/www/devices/16C65A_16C65A_extended.png
    trunk/www/devices/16C65A_16LC65A_industrial.png
    trunk/www/devices/16C65A_pins_graph.png
    trunk/www/devices/16C65B.htm
    trunk/www/devices/16C65B_16C65B_extended.png
    trunk/www/devices/16C65B_16LC65B_industrial.png
    trunk/www/devices/16C65B_pins_graph.png
    trunk/www/devices/16C65_16C65_industrial.png
    trunk/www/devices/16C65_16LC65_industrial.png
    trunk/www/devices/16C65_pins_graph.png
    trunk/www/devices/16C66.htm
    trunk/www/devices/16C661.htm
    trunk/www/devices/16C661_16C661_extended.png
    trunk/www/devices/16C661_16LC661_industrial.png
    trunk/www/devices/16C661_pins_graph.png
    trunk/www/devices/16C662.htm
    trunk/www/devices/16C662_16C662_extended.png
    trunk/www/devices/16C662_16LC662_industrial.png
    trunk/www/devices/16C662_pins_graph.png
    trunk/www/devices/16C66_16C66_extended.png
    trunk/www/devices/16C66_16LC66_industrial.png
    trunk/www/devices/16C66_pins_graph.png
    trunk/www/devices/16C67.htm
    trunk/www/devices/16C67_16C67_extended.png
    trunk/www/devices/16C67_16LC67_industrial.png
    trunk/www/devices/16C67_pins_graph.png
    trunk/www/devices/16C710.htm
    trunk/www/devices/16C710_16C710_extended.png
    trunk/www/devices/16C710_16LC710_commercial.png
    trunk/www/devices/16C710_16LC710_extended.png
    trunk/www/devices/16C710_pins_graph.png
    trunk/www/devices/16C711.htm
    trunk/www/devices/16C711_16C711_extended.png
    trunk/www/devices/16C711_16LC711_commercial.png
    trunk/www/devices/16C711_16LC711_extended.png
    trunk/www/devices/16C711_pins_graph.png
    trunk/www/devices/16C712.htm
    trunk/www/devices/16C712_16C712_extended.png
    trunk/www/devices/16C712_16LC712_commercial.png
    trunk/www/devices/16C712_pins_graph.png
    trunk/www/devices/16C715.htm
    trunk/www/devices/16C715_16C715_extended.png
    trunk/www/devices/16C715_16LC715_industrial.png
    trunk/www/devices/16C715_pins_graph.png
    trunk/www/devices/16C716.htm
    trunk/www/devices/16C716_16C716_extended.png
    trunk/www/devices/16C716_16LC716_commercial.png
    trunk/www/devices/16C716_pins_graph.png
    trunk/www/devices/16C717.htm
    trunk/www/devices/16C717_16C717_industrial.png
    trunk/www/devices/16C717_16LC717_commercial.png
    trunk/www/devices/16C717_16LC717_industrial.png
    trunk/www/devices/16C717_pins_graph.png
    trunk/www/devices/16C71_16C71_industrial.png
    trunk/www/devices/16C71_16LC71_industrial.png
    trunk/www/devices/16C71_pins_graph.png
    trunk/www/devices/16C72.htm
    trunk/www/devices/16C72A.htm
    trunk/www/devices/16C72A_16C72A_extended.png
    trunk/www/devices/16C72A_16LC72A_industrial.png
    trunk/www/devices/16C72A_pins_graph.png
    trunk/www/devices/16C72_16C72_extended.png
    trunk/www/devices/16C72_16LC72_industrial.png
    trunk/www/devices/16C72_pins_graph.png
    trunk/www/devices/16C73A.htm
    trunk/www/devices/16C73A_16C73A_extended.png
    trunk/www/devices/16C73A_16LC73A_industrial.png
    trunk/www/devices/16C73A_pins_graph.png
    trunk/www/devices/16C73B.htm
    trunk/www/devices/16C73B_16C73B_extended.png
    trunk/www/devices/16C73B_16LC73B_industrial.png
    trunk/www/devices/16C73B_pins_graph.png
    trunk/www/devices/16C73_16C73_industrial.png
    trunk/www/devices/16C73_16LC73_industrial.png
    trunk/www/devices/16C73_pins_graph.png
    trunk/www/devices/16C745_16C745_industrial.png
    trunk/www/devices/16C745_pins_graph.png
    trunk/www/devices/16C74A.htm
    trunk/www/devices/16C74A_16C74A_extended.png
    trunk/www/devices/16C74A_16LC74A_industrial.png
    trunk/www/devices/16C74A_pins_graph.png
    trunk/www/devices/16C74B.htm
    trunk/www/devices/16C74B_16C74B_extended.png
    trunk/www/devices/16C74B_16LC74B_industrial.png
    trunk/www/devices/16C74B_pins_graph.png
    trunk/www/devices/16C74_16C74_industrial.png
    trunk/www/devices/16C74_16LC74_industrial.png
    trunk/www/devices/16C74_pins_graph.png
    trunk/www/devices/16C76.htm
    trunk/www/devices/16C765_16C765_industrial.png
    trunk/www/devices/16C765_pins_graph.png
    trunk/www/devices/16C76_16C76_extended.png
    trunk/www/devices/16C76_16LC76_industrial.png
    trunk/www/devices/16C76_pins_graph.png
    trunk/www/devices/16C77.htm
    trunk/www/devices/16C770.htm
    trunk/www/devices/16C770_16C770_industrial.png
    trunk/www/devices/16C770_16LC770_commercial.png
    trunk/www/devices/16C770_16LC770_industrial.png
    trunk/www/devices/16C770_pins_graph.png
    trunk/www/devices/16C771.htm
    trunk/www/devices/16C771_16C771_industrial.png
    trunk/www/devices/16C771_16LC771_commercial.png
    trunk/www/devices/16C771_16LC771_industrial.png
    trunk/www/devices/16C771_pins_graph.png
    trunk/www/devices/16C773_16C773_industrial.png
    trunk/www/devices/16C773_16LC773_industrial.png
    trunk/www/devices/16C773_pins_graph.png
    trunk/www/devices/16C774_16C774_industrial.png
    trunk/www/devices/16C774_16LC774_industrial.png
    trunk/www/devices/16C774_pins_graph.png
    trunk/www/devices/16C77_16C77_extended.png
    trunk/www/devices/16C77_16LC77_industrial.png
    trunk/www/devices/16C77_pins_graph.png
    trunk/www/devices/16C781_16C781_industrial.png
    trunk/www/devices/16C781_16LC781_industrial.png
    trunk/www/devices/16C781_pins_graph.png
    trunk/www/devices/16C782_16C782_industrial.png
    trunk/www/devices/16C782_16LC782_industrial.png
    trunk/www/devices/16C782_pins_graph.png
    trunk/www/devices/16C84_16C84_industrial.png
    trunk/www/devices/16C84_16LC84_industrial.png
    trunk/www/devices/16C84_pins_graph.png
    trunk/www/devices/16C923_16C923_industrial.png
    trunk/www/devices/16C923_16LC923_industrial.png
    trunk/www/devices/16C923_pins_graph.png
    trunk/www/devices/16C924_16C924_industrial.png
    trunk/www/devices/16C924_16LC924_industrial.png
    trunk/www/devices/16C924_pins_graph.png
    trunk/www/devices/16C925_16C925_industrial.png
    trunk/www/devices/16C925_16LC925_industrial.png
    trunk/www/devices/16C926_16C926_industrial.png
    trunk/www/devices/16C926_16LC926_industrial.png
    trunk/www/devices/16CE623_16CE623_commercial.png
    trunk/www/devices/16CE623_16CE623_extended.png
    trunk/www/devices/16CE623_16LCE623_extended.png
    trunk/www/devices/16CE623_pins_graph.png
    trunk/www/devices/16CE624_16CE624_commercial.png
    trunk/www/devices/16CE624_16CE624_extended.png
    trunk/www/devices/16CE624_16LCE624_extended.png
    trunk/www/devices/16CE624_pins_graph.png
    trunk/www/devices/16CE625_16CE625_commercial.png
    trunk/www/devices/16CE625_16CE625_extended.png
    trunk/www/devices/16CE625_16LCE625_extended.png
    trunk/www/devices/16CE625_pins_graph.png
    trunk/www/devices/16CR54A.htm
    trunk/www/devices/16CR54A_16CR54A_extended.png
    trunk/www/devices/16CR54A_16CR54A_industrial.png
    trunk/www/devices/16CR54A_16LCR54A_industrial.png
    trunk/www/devices/16CR54A_pins_graph.png
    trunk/www/devices/16CR54B.htm
    trunk/www/devices/16CR54B_16CR54B_extended.png
    trunk/www/devices/16CR54B_16CR54B_industrial.png
    trunk/www/devices/16CR54B_16LCR54B_industrial.png
    trunk/www/devices/16CR54B_pins_graph.png
    trunk/www/devices/16CR54C.htm
    trunk/www/devices/16CR54C_16CR54C_extended.png
    trunk/www/devices/16CR54C_16CR54C_industrial.png
    trunk/www/devices/16CR54C_16LCR54C_industrial.png
    trunk/www/devices/16CR54C_pins_graph.png
    trunk/www/devices/16CR56A.htm
    trunk/www/devices/16CR56A_16CR56A_extended.png
    trunk/www/devices/16CR56A_16CR56A_industrial.png
    trunk/www/devices/16CR56A_16LCR56A_industrial.png
    trunk/www/devices/16CR56A_pins_graph.png
    trunk/www/devices/16CR57B.htm
    trunk/www/devices/16CR57B_16CR57B_extended.png
    trunk/www/devices/16CR57B_16CR57B_industrial.png
    trunk/www/devices/16CR57B_16LCR57B_industrial.png
    trunk/www/devices/16CR57B_pins_graph.png
    trunk/www/devices/16CR57C.htm
    trunk/www/devices/16CR57C_16CR57C_extended.png
    trunk/www/devices/16CR57C_16CR57C_industrial.png
    trunk/www/devices/16CR57C_16LCR57C_industrial.png
    trunk/www/devices/16CR57C_pins_graph.png
    trunk/www/devices/16CR58A.htm
    trunk/www/devices/16CR58A_16CR58A_extended.png
    trunk/www/devices/16CR58A_16CR58A_industrial.png
    trunk/www/devices/16CR58A_16LCR58A_industrial.png
    trunk/www/devices/16CR58A_pins_graph.png
    trunk/www/devices/16CR58B.htm
    trunk/www/devices/16CR58B_16CR58B_extended.png
    trunk/www/devices/16CR58B_16CR58B_industrial.png
    trunk/www/devices/16CR58B_16LCR58B_industrial.png
    trunk/www/devices/16CR58B_pins_graph.png
    trunk/www/devices/16CR62.htm
    trunk/www/devices/16CR620A_16CR620A_commercial.png
    trunk/www/devices/16CR620A_16CR620A_extended.png
    trunk/www/devices/16CR620A_16LCR620A_extended.png
    trunk/www/devices/16CR620A_pins_graph.png
    trunk/www/devices/16CR62_16CR62_extended.png
    trunk/www/devices/16CR62_16LCR62_industrial.png
    trunk/www/devices/16CR62_pins_graph.png
    trunk/www/devices/16CR63_16CR63_industrial.png
    trunk/www/devices/16CR63_16LCR63_industrial.png
    trunk/www/devices/16CR63_pins_graph.png
    trunk/www/devices/16CR64.htm
    trunk/www/devices/16CR64_16CR64_extended.png
    trunk/www/devices/16CR64_16LCR64_industrial.png
    trunk/www/devices/16CR64_pins_graph.png
    trunk/www/devices/16CR65_16CR65_industrial.png
    trunk/www/devices/16CR65_16LCR65_industrial.png
    trunk/www/devices/16CR65_pins_graph.png
    trunk/www/devices/16CR72.htm
    trunk/www/devices/16CR72_16CR72_extended.png
    trunk/www/devices/16CR72_16LCR72_industrial.png
    trunk/www/devices/16CR72_pins_graph.png
    trunk/www/devices/16CR73.htm
    trunk/www/devices/16CR73_16CR73_extended.png
    trunk/www/devices/16CR73_16LCR73_industrial.png
    trunk/www/devices/16CR73_pins_graph.png
    trunk/www/devices/16CR74.htm
    trunk/www/devices/16CR74_16CR74_extended.png
    trunk/www/devices/16CR74_16LCR74_industrial.png
    trunk/www/devices/16CR74_pins_graph.png
    trunk/www/devices/16CR76.htm
    trunk/www/devices/16CR76_16CR76_extended.png
    trunk/www/devices/16CR76_16LCR76_industrial.png
    trunk/www/devices/16CR76_pins_graph.png
    trunk/www/devices/16CR77.htm
    trunk/www/devices/16CR77_16CR77_extended.png
    trunk/www/devices/16CR77_16LCR77_industrial.png
    trunk/www/devices/16CR77_pins_graph.png
    trunk/www/devices/16CR83_16CR83_industrial.png
    trunk/www/devices/16CR83_16LCR83_industrial.png
    trunk/www/devices/16CR83_pins_graph.png
    trunk/www/devices/16CR84_16CR84_industrial.png
    trunk/www/devices/16CR84_16LCR84_industrial.png
    trunk/www/devices/16CR84_pins_graph.png
    trunk/www/devices/16F1507_16F1507_extended.png
    trunk/www/devices/16F1507_16LF1507_extended.png
    trunk/www/devices/16F1507_pins_graph.png
    trunk/www/devices/16F1826.htm
    trunk/www/devices/16F1826_16F1826_extended.png
    trunk/www/devices/16F1826_16LF1826_extended.png
    trunk/www/devices/16F1826_pins_graph.png
    trunk/www/devices/16F1827.htm
    trunk/www/devices/16F1827_16F1827_extended.png
    trunk/www/devices/16F1827_16LF1827_extended.png
    trunk/www/devices/16F1827_pins_graph.png
    trunk/www/devices/16F1829.htm
    trunk/www/devices/16F1829_16F1829_extended.png
    trunk/www/devices/16F1829_16LF1829_extended.png
    trunk/www/devices/16F1829_pins_graph.png
    trunk/www/devices/16F1933_16F1933_extended.png
    trunk/www/devices/16F1933_16LF1933_extended.png
    trunk/www/devices/16F1933_pins_graph.png
    trunk/www/devices/16F1934_16F1934_extended.png
    trunk/www/devices/16F1934_16LF1934_extended.png
    trunk/www/devices/16F1934_pins_graph.png
    trunk/www/devices/16F1936_16F1936_extended.png
    trunk/www/devices/16F1936_16LF1936_extended.png
    trunk/www/devices/16F1936_pins_graph.png
    trunk/www/devices/16F1937_16F1937_extended.png
    trunk/www/devices/16F1937_16LF1937_extended.png
    trunk/www/devices/16F1937_pins_graph.png
    trunk/www/devices/16F1938_16F1938_extended.png
    trunk/www/devices/16F1938_16LF1938_extended.png
    trunk/www/devices/16F1938_pins_graph.png
    trunk/www/devices/16F1939_16F1939_extended.png
    trunk/www/devices/16F1939_16LF1939_extended.png
    trunk/www/devices/16F1939_pins_graph.png
    trunk/www/devices/16F1946_16F1946_extended.png
    trunk/www/devices/16F1946_16LF1946_extended.png
    trunk/www/devices/16F1947_16F1947_extended.png
    trunk/www/devices/16F1947_16LF1947_extended.png
    trunk/www/devices/16F505_16F505_extended.png
    trunk/www/devices/16F505_pins_graph.png
    trunk/www/devices/16F506_16F506_extended.png
    trunk/www/devices/16F506_pins_graph.png
    trunk/www/devices/16F526_16F526_extended.png
    trunk/www/devices/16F526_pins_graph.png
    trunk/www/devices/16F54_16F54_extended.png
    trunk/www/devices/16F54_pins_graph.png
    trunk/www/devices/16F57_16F57_extended.png
    trunk/www/devices/16F57_pins_graph.png
    trunk/www/devices/16F59_16F59_extended.png
    trunk/www/devices/16F59_pins_graph.png
    trunk/www/devices/16F610_16F610_extended.png
    trunk/www/devices/16F610_16HV610_extended.png
    trunk/www/devices/16F610_pins_graph.png
    trunk/www/devices/16F616_16F616_extended.png
    trunk/www/devices/16F616_16HV616_extended.png
    trunk/www/devices/16F616_pins_graph.png
    trunk/www/devices/16F627.htm
    trunk/www/devices/16F627A.htm
    trunk/www/devices/16F627A_16F627A_extended.png
    trunk/www/devices/16F627A_16LF627A_industrial.png
    trunk/www/devices/16F627A_pins_graph.png
    trunk/www/devices/16F627_16F627_commercial.png
    trunk/www/devices/16F627_16F627_extended.png
    trunk/www/devices/16F627_16LF627_commercial.png
    trunk/www/devices/16F627_16LF627_extended.png
    trunk/www/devices/16F627_pins_graph.png
    trunk/www/devices/16F628.htm
    trunk/www/devices/16F628A.htm
    trunk/www/devices/16F628A_16F628A_extended.png
    trunk/www/devices/16F628A_16LF628A_industrial.png
    trunk/www/devices/16F628A_pins_graph.png
    trunk/www/devices/16F628_16F628_commercial.png
    trunk/www/devices/16F628_16F628_extended.png
    trunk/www/devices/16F628_16LF628_commercial.png
    trunk/www/devices/16F628_16LF628_extended.png
    trunk/www/devices/16F628_pins_graph.png
    trunk/www/devices/16F630_16F630_commercial.png
    trunk/www/devices/16F630_16F630_extended.png
    trunk/www/devices/16F630_pins_graph.png
    trunk/www/devices/16F631_16F631_extended.png
    trunk/www/devices/16F631_pins_graph.png
    trunk/www/devices/16F636_16F636_extended.png
    trunk/www/devices/16F636_pins_graph.png
    trunk/www/devices/16F639_16F639_extended.png
    trunk/www/devices/16F639_pins_graph.png
    trunk/www/devices/16F648A.htm
    trunk/www/devices/16F648A_16F648A_extended.png
    trunk/www/devices/16F648A_16LF648A_industrial.png
    trunk/www/devices/16F648A_pins_graph.png
    trunk/www/devices/16F676_16F676_commercial.png
    trunk/www/devices/16F676_16F676_extended.png
    trunk/www/devices/16F676_pins_graph.png
    trunk/www/devices/16F677_16F677_extended.png
    trunk/www/devices/16F677_pins_graph.png
    trunk/www/devices/16F684_16F684_extended.png
    trunk/www/devices/16F684_pins_graph.png
    trunk/www/devices/16F685_16F685_extended.png
    trunk/www/devices/16F685_pins_graph.png
    trunk/www/devices/16F687_16F687_extended.png
    trunk/www/devices/16F687_pins_graph.png
    trunk/www/devices/16F688_16F688_extended.png
    trunk/www/devices/16F688_pins_graph.png
    trunk/www/devices/16F689_16F689_extended.png
    trunk/www/devices/16F689_pins_graph.png
    trunk/www/devices/16F690_16F690_extended.png
    trunk/www/devices/16F690_pins_graph.png
    trunk/www/devices/16F716_16F716_extended.png
    trunk/www/devices/16F716_16F716_industrial.png
    trunk/www/devices/16F716_pins_graph.png
    trunk/www/devices/16F72.htm
    trunk/www/devices/16F722_16F722_extended.png
    trunk/www/devices/16F722_16LF722_extended.png
    trunk/www/devices/16F722_pins_graph.png
    trunk/www/devices/16F723_16F723_extended.png
    trunk/www/devices/16F723_16LF723_extended.png
    trunk/www/devices/16F723_pins_graph.png
    trunk/www/devices/16F724_16F724_extended.png
    trunk/www/devices/16F724_16LF724_extended.png
    trunk/www/devices/16F724_pins_graph.png
    trunk/www/devices/16F726_16F726_extended.png
    trunk/www/devices/16F726_16LF726_extended.png
    trunk/www/devices/16F726_pins_graph.png
    trunk/www/devices/16F727_16F727_extended.png
    trunk/www/devices/16F727_16LF727_extended.png
    trunk/www/devices/16F727_pins_graph.png
    trunk/www/devices/16F72_16F72_extended.png
    trunk/www/devices/16F72_16LF72_industrial.png
    trunk/www/devices/16F72_pins_graph.png
    trunk/www/devices/16F73.htm
    trunk/www/devices/16F737.htm
    trunk/www/devices/16F737_16F737_extended.png
    trunk/www/devices/16F737_16LF737_industrial.png
    trunk/www/devices/16F737_pins_graph.png
    trunk/www/devices/16F73_16F73_extended.png
    trunk/www/devices/16F73_16LF73_industrial.png
    trunk/www/devices/16F73_pins_graph.png
    trunk/www/devices/16F74.htm
    trunk/www/devices/16F747.htm
    trunk/www/devices/16F747_16F747_extended.png
    trunk/www/devices/16F747_16LF747_industrial.png
    trunk/www/devices/16F747_pins_graph.png
    trunk/www/devices/16F74_16F74_extended.png
    trunk/www/devices/16F74_16LF74_industrial.png
    trunk/www/devices/16F74_pins_graph.png
    trunk/www/devices/16F76.htm
    trunk/www/devices/16F767.htm
    trunk/www/devices/16F767_16F767_extended.png
    trunk/www/devices/16F767_16LF767_industrial.png
    trunk/www/devices/16F767_pins_graph.png
    trunk/www/devices/16F76_16F76_extended.png
    trunk/www/devices/16F76_16LF76_industrial.png
    trunk/www/devices/16F76_pins_graph.png
    trunk/www/devices/16F77.htm
    trunk/www/devices/16F777.htm
    trunk/www/devices/16F777_16F777_extended.png
    trunk/www/devices/16F777_16LF777_industrial.png
    trunk/www/devices/16F777_pins_graph.png
    trunk/www/devices/16F77_16F77_extended.png
    trunk/www/devices/16F77_16LF77_industrial.png
    trunk/www/devices/16F77_pins_graph.png
    trunk/www/devices/16F785_16F785_extended.png
    trunk/www/devices/16F785_16HV785_extended.png
    trunk/www/devices/16F785_pins_graph.png
    trunk/www/devices/16F818.htm
    trunk/www/devices/16F818_16F818_extended.png
    trunk/www/devices/16F818_16LF818_industrial.png
    trunk/www/devices/16F818_pins_graph.png
    trunk/www/devices/16F819.htm
    trunk/www/devices/16F819_16F819_extended.png
    trunk/www/devices/16F819_16LF819_industrial.png
    trunk/www/devices/16F819_pins_graph.png
    trunk/www/devices/16F83_16F83_industrial.png
    trunk/www/devices/16F83_16LF83_industrial.png
    trunk/www/devices/16F83_pins_graph.png
    trunk/www/devices/16F84A_16F84A_extended.png
    trunk/www/devices/16F84A_16LF84A_extended.png
    trunk/www/devices/16F84A_pins_graph.png
    trunk/www/devices/16F84_16F84_industrial.png
    trunk/www/devices/16F84_16LF84_industrial.png
    trunk/www/devices/16F84_pins_graph.png
    trunk/www/devices/16F87.htm
    trunk/www/devices/16F870_16F870_industrial.png
    trunk/www/devices/16F870_16LF870_industrial.png
    trunk/www/devices/16F870_pins_graph.png
    trunk/www/devices/16F871_16F871_industrial.png
    trunk/www/devices/16F871_16LF871_industrial.png
    trunk/www/devices/16F871_pins_graph.png
    trunk/www/devices/16F872_16F872_industrial.png
    trunk/www/devices/16F872_16LF872_industrial.png
    trunk/www/devices/16F872_pins_graph.png
    trunk/www/devices/16F873.htm
    trunk/www/devices/16F873A.htm
    trunk/www/devices/16F873A_16F873A_extended.png
    trunk/www/devices/16F873A_16LF873A_industrial.png
    trunk/www/devices/16F873A_pins_graph.png
    trunk/www/devices/16F873_16F873_extended.png
    trunk/www/devices/16F873_16F873_industrial.png
    trunk/www/devices/16F873_16LF873_industrial.png
    trunk/www/devices/16F873_pins_graph.png
    trunk/www/devices/16F874.htm
    trunk/www/devices/16F874A.htm
    trunk/www/devices/16F874A_16F874A_extended.png
    trunk/www/devices/16F874A_16LF874A_industrial.png
    trunk/www/devices/16F874A_pins_graph.png
    trunk/www/devices/16F874_16F874_extended.png
    trunk/www/devices/16F874_16F874_industrial.png
    trunk/www/devices/16F874_16LF874_industrial.png
    trunk/www/devices/16F874_pins_graph.png
    trunk/www/devices/16F876.htm
    trunk/www/devices/16F876A.htm
    trunk/www/devices/16F876A_16F876A_extended.png
    trunk/www/devices/16F876A_16LF876A_industrial.png
    trunk/www/devices/16F876A_pins_graph.png
    trunk/www/devices/16F876_16F876_extended.png
    trunk/www/devices/16F876_16F876_industrial.png
    trunk/www/devices/16F876_16LF876_industrial.png
    trunk/www/devices/16F876_pins_graph.png
    trunk/www/devices/16F877.htm
    trunk/www/devices/16F877A.htm
    trunk/www/devices/16F877A_16F877A_extended.png
    trunk/www/devices/16F877A_16LF877A_industrial.png
    trunk/www/devices/16F877A_pins_graph.png
    trunk/www/devices/16F877_16F877_extended.png
    trunk/www/devices/16F877_16F877_industrial.png
    trunk/www/devices/16F877_16LF877_industrial.png
    trunk/www/devices/16F877_pins_graph.png
    trunk/www/devices/16F87_16F87_extended.png
    trunk/www/devices/16F87_16LF87_industrial.png
    trunk/www/devices/16F87_pins_graph.png
    trunk/www/devices/16F88.htm
    trunk/www/devices/16F882_16F882_extended.png
    trunk/www/devices/16F882_pins_graph.png
    trunk/www/devices/16F883_16F883_extended.png
    trunk/www/devices/16F883_pins_graph.png
    trunk/www/devices/16F884_16F884_extended.png
    trunk/www/devices/16F884_pins_graph.png
    trunk/www/devices/16F886_16F886_extended.png
    trunk/www/devices/16F886_pins_graph.png
    trunk/www/devices/16F887_16F887_extended.png
    trunk/www/devices/16F887_pins_graph.png
    trunk/www/devices/16F88_16F88_extended.png
    trunk/www/devices/16F88_16LF88_industrial.png
    trunk/www/devices/16F88_pins_graph.png
    trunk/www/devices/16F913_16F913_extended.png
    trunk/www/devices/16F913_pins_graph.png
    trunk/www/devices/16F914_16F914_extended.png
    trunk/www/devices/16F916_16F916_extended.png
    trunk/www/devices/16F916_pins_graph.png
    trunk/www/devices/16F917_16F917_extended.png
    trunk/www/devices/16F946_16F946_extended.png
    trunk/www/devices/16HV540_16HV540_industrial.png
    trunk/www/devices/16HV540_pins_graph.png
    trunk/www/devices/17C42A_17C42A_industrial.png
    trunk/www/devices/17C42A_17LC42A_industrial.png
    trunk/www/devices/17C42A_pins_graph.png
    trunk/www/devices/17C42_17C42_industrial.png
    trunk/www/devices/17C42_pins_graph.png
    trunk/www/devices/17C43_17C43_industrial.png
    trunk/www/devices/17C43_17LC43_industrial.png
    trunk/www/devices/17C43_pins_graph.png
    trunk/www/devices/17C44_17C44_industrial.png
    trunk/www/devices/17C44_17LC44_industrial.png
    trunk/www/devices/17C44_pins_graph.png
    trunk/www/devices/17C752.htm
    trunk/www/devices/17C752_17C752_extended.png
    trunk/www/devices/17C752_17LC752_industrial.png
    trunk/www/devices/17C756.htm
    trunk/www/devices/17C756A.htm
    trunk/www/devices/17C756A_17C756A_extended.png
    trunk/www/devices/17C756A_17LC756A_industrial.png
    trunk/www/devices/17C756_17C756_extended.png
    trunk/www/devices/17C756_17LC756_industrial.png
    trunk/www/devices/17C762.htm
    trunk/www/devices/17C762_17C762_extended.png
    trunk/www/devices/17C762_17LC762_industrial.png
    trunk/www/devices/17C766.htm
    trunk/www/devices/17C766_17C766_extended.png
    trunk/www/devices/17C766_17LC766_industrial.png
    trunk/www/devices/17CR42_17CR42_industrial.png
    trunk/www/devices/17CR42_17LCR42_industrial.png
    trunk/www/devices/17CR42_pins_graph.png
    trunk/www/devices/17CR43_17CR43_industrial.png
    trunk/www/devices/17CR43_17LCR43_industrial.png
    trunk/www/devices/17CR43_pins_graph.png
    trunk/www/devices/18C242.htm
    trunk/www/devices/18C242_18C242_extended.png
    trunk/www/devices/18C242_18LC242_industrial.png
    trunk/www/devices/18C242_pins_graph.png
    trunk/www/devices/18C252.htm
    trunk/www/devices/18C252_18C252_extended.png
    trunk/www/devices/18C252_18LC252_industrial.png
    trunk/www/devices/18C252_pins_graph.png
    trunk/www/devices/18C442.htm
    trunk/www/devices/18C442_18C442_extended.png
    trunk/www/devices/18C442_18LC442_industrial.png
    trunk/www/devices/18C442_pins_graph.png
    trunk/www/devices/18C452.htm
    trunk/www/devices/18C452_18C452_extended.png
    trunk/www/devices/18C452_18LC452_industrial.png
    trunk/www/devices/18C452_pins_graph.png
    trunk/www/devices/18C601.htm
    trunk/www/devices/18C601_18C601_extended.png
    trunk/www/devices/18C601_18LC601_industrial.png
    trunk/www/devices/18C658.htm
    trunk/www/devices/18C658_18C658_extended.png
    trunk/www/devices/18C658_18LC658_industrial.png
    trunk/www/devices/18C801.htm
    trunk/www/devices/18C801_18C801_extended.png
    trunk/www/devices/18C801_18LC801_industrial.png
    trunk/www/devices/18C858.htm
    trunk/www/devices/18C858_18C858_extended.png
    trunk/www/devices/18C858_18LC858_industrial.png
    trunk/www/devices/18F1220.htm
    trunk/www/devices/18F1220_18F1220_extended.png
    trunk/www/devices/18F1220_18F1220_industrial.png
    trunk/www/devices/18F1220_18LF1220_industrial.png
    trunk/www/devices/18F1220_pins_graph.png
    trunk/www/devices/18F1230.htm
    trunk/www/devices/18F1230_18F1230_extended.png
    trunk/www/devices/18F1230_18F1230_industrial.png
    trunk/www/devices/18F1230_18LF1230_industrial.png
    trunk/www/devices/18F1230_pins_graph.png
    trunk/www/devices/18F1320.htm
    trunk/www/devices/18F1320_18F1320_extended.png
    trunk/www/devices/18F1320_18F1320_industrial.png
    trunk/www/devices/18F1320_18LF1320_industrial.png
    trunk/www/devices/18F1320_pins_graph.png
    trunk/www/devices/18F1330.htm
    trunk/www/devices/18F1330_18F1330_extended.png
    trunk/www/devices/18F1330_18F1330_industrial.png
    trunk/www/devices/18F1330_18LF1330_industrial.png
    trunk/www/devices/18F1330_pins_graph.png
    trunk/www/devices/18F13K22.htm
    trunk/www/devices/18F13K22_18F13K22_extended.png
    trunk/www/devices/18F13K22_18F13K22_industrial.png
    trunk/www/devices/18F13K22_18LF13K22_extended.png
    trunk/www/devices/18F13K22_18LF13K22_industrial.png
    trunk/www/devices/18F13K22_pins_graph.png
    trunk/www/devices/18F13K50.htm
    trunk/www/devices/18F13K50_18F13K50_extended.png
    trunk/www/devices/18F13K50_18F13K50_industrial.png
    trunk/www/devices/18F13K50_18LF13K50_extended.png
    trunk/www/devices/18F13K50_18LF13K50_industrial.png
    trunk/www/devices/18F13K50_pins_graph.png
    trunk/www/devices/18F14K22.htm
    trunk/www/devices/18F14K22_18F14K22_extended.png
    trunk/www/devices/18F14K22_18F14K22_industrial.png
    trunk/www/devices/18F14K22_18LF14K22_extended.png
    trunk/www/devices/18F14K22_18LF14K22_industrial.png
    trunk/www/devices/18F14K22_pins_graph.png
    trunk/www/devices/18F14K50.htm
    trunk/www/devices/18F14K50_18F14K50_extended.png
    trunk/www/devices/18F14K50_18F14K50_industrial.png
    trunk/www/devices/18F14K50_18LF14K50_extended.png
    trunk/www/devices/18F14K50_18LF14K50_industrial.png
    trunk/www/devices/18F14K50_pins_graph.png
    trunk/www/devices/18F2220.htm
    trunk/www/devices/18F2220_18F2220_extended.png
    trunk/www/devices/18F2220_18F2220_industrial.png
    trunk/www/devices/18F2220_18LF2220_industrial.png
    trunk/www/devices/18F2220_pins_graph.png
    trunk/www/devices/18F2221.htm
    trunk/www/devices/18F2221_18F2221_extended.png
    trunk/www/devices/18F2221_18F2221_industrial.png
    trunk/www/devices/18F2221_18LF2221_industrial.png
    trunk/www/devices/18F2221_pins_graph.png
    trunk/www/devices/18F2320.htm
    trunk/www/devices/18F2320_18F2320_extended.png
    trunk/www/devices/18F2320_18F2320_industrial.png
    trunk/www/devices/18F2320_18LF2320_industrial.png
    trunk/www/devices/18F2320_pins_graph.png
    trunk/www/devices/18F2321.htm
    trunk/www/devices/18F2321_18F2321_extended.png
    trunk/www/devices/18F2321_18F2321_industrial.png
    trunk/www/devices/18F2321_18LF2321_industrial.png
    trunk/www/devices/18F2321_pins_graph.png
    trunk/www/devices/18F2331.htm
    trunk/www/devices/18F2331_18F2331_extended.png
    trunk/www/devices/18F2331_18F2331_industrial.png
    trunk/www/devices/18F2331_18LF2331_industrial.png
    trunk/www/devices/18F2331_pins_graph.png
    trunk/www/devices/18F23K20_18F23K20_extended.png
    trunk/www/devices/18F23K20_18F23K20_industrial.png
    trunk/www/devices/18F23K20_pins_graph.png
    trunk/www/devices/18F23K22.htm
    trunk/www/devices/18F23K22_18F23K22_extended.png
    trunk/www/devices/18F23K22_18F23K22_industrial.png
    trunk/www/devices/18F23K22_18LF23K22_extended.png
    trunk/www/devices/18F23K22_18LF23K22_industrial.png
    trunk/www/devices/18F23K22_pins_graph.png
    trunk/www/devices/18F2410.htm
    trunk/www/devices/18F2410_18F2410_extended.png
    trunk/www/devices/18F2410_18F2410_industrial.png
    trunk/www/devices/18F2410_18LF2410_industrial.png
    trunk/www/devices/18F2410_pins_graph.png
    trunk/www/devices/18F242.htm
    trunk/www/devices/18F2420.htm
    trunk/www/devices/18F2420_18F2420_extended.png
    trunk/www/devices/18F2420_18F2420_industrial.png
    trunk/www/devices/18F2420_18LF2420_industrial.png
    trunk/www/devices/18F2420_pins_graph.png
    trunk/www/devices/18F2423_18F2423_industrial.png
    trunk/www/devices/18F2423_18LF2423_industrial.png
    trunk/www/devices/18F2423_pins_graph.png
    trunk/www/devices/18F242_18F242_extended.png
    trunk/www/devices/18F242_18F242_industrial.png
    trunk/www/devices/18F242_18LF242_industrial.png
    trunk/www/devices/18F242_pins_graph.png
    trunk/www/devices/18F2431.htm
    trunk/www/devices/18F2431_18F2431_extended.png
    trunk/www/devices/18F2431_18F2431_industrial.png
    trunk/www/devices/18F2431_18LF2431_industrial.png
    trunk/www/devices/18F2431_pins_graph.png
    trunk/www/devices/18F2439.htm
    trunk/www/devices/18F2439_18F2439_extended.png
    trunk/www/devices/18F2439_18F2439_industrial.png
    trunk/www/devices/18F2439_18LF2439_industrial.png
    trunk/www/devices/18F2439_pins_graph.png
    trunk/www/devices/18F2450.htm
    trunk/www/devices/18F2450_18F2450_extended.png
    trunk/www/devices/18F2450_18F2450_industrial.png
    trunk/www/devices/18F2450_18LF2450_industrial.png
    trunk/www/devices/18F2450_pins_graph.png
    trunk/www/devices/18F2455_18F2455_industrial.png
    trunk/www/devices/18F2455_18LF2455_industrial.png
    trunk/www/devices/18F2455_pins_graph.png
    trunk/www/devices/18F2458_18F2458_industrial.png
    trunk/www/devices/18F2458_18LF2458_industrial.png
    trunk/www/devices/18F2458_pins_graph.png
    trunk/www/devices/18F248.htm
    trunk/www/devices/18F2480.htm
    trunk/www/devices/18F2480_18F2480_extended.png
    trunk/www/devices/18F2480_18F2480_industrial.png
    trunk/www/devices/18F2480_18LF2480_industrial.png
    trunk/www/devices/18F2480_pins_graph.png
    trunk/www/devices/18F248_18F248_extended.png
    trunk/www/devices/18F248_18F248_industrial.png
    trunk/www/devices/18F248_18LF248_industrial.png
    trunk/www/devices/18F248_pins_graph.png
    trunk/www/devices/18F24J10_18F24J10_industrial.png
    trunk/www/devices/18F24J10_18LF24J10_industrial.png
    trunk/www/devices/18F24J10_pins_graph.png
    trunk/www/devices/18F24K20_18F24K20_extended.png
    trunk/www/devices/18F24K20_18F24K20_industrial.png
    trunk/www/devices/18F24K20_pins_graph.png
    trunk/www/devices/18F24K22.htm
    trunk/www/devices/18F24K22_18F24K22_extended.png
    trunk/www/devices/18F24K22_18F24K22_industrial.png
    trunk/www/devices/18F24K22_18LF24K22_extended.png
    trunk/www/devices/18F24K22_18LF24K22_industrial.png
    trunk/www/devices/18F24K22_pins_graph.png
    trunk/www/devices/18F2510.htm
    trunk/www/devices/18F2510_18F2510_extended.png
    trunk/www/devices/18F2510_18F2510_industrial.png
    trunk/www/devices/18F2510_18LF2510_industrial.png
    trunk/www/devices/18F2510_pins_graph.png
    trunk/www/devices/18F2515.htm
    trunk/www/devices/18F2515_18F2515_extended.png
    trunk/www/devices/18F2515_18F2515_industrial.png
    trunk/www/devices/18F2515_18LF2515_industrial.png
    trunk/www/devices/18F2515_pins_graph.png
    trunk/www/devices/18F252.htm
    trunk/www/devices/18F2520.htm
    trunk/www/devices/18F2520_18F2520_extended.png
    trunk/www/devices/18F2520_18F2520_industrial.png
    trunk/www/devices/18F2520_18LF2520_industrial.png
    trunk/www/devices/18F2520_pins_graph.png
    trunk/www/devices/18F2523_18F2523_industrial.png
    trunk/www/devices/18F2523_18LF2523_industrial.png
    trunk/www/devices/18F2523_pins_graph.png
    trunk/www/devices/18F2525.htm
    trunk/www/devices/18F2525_18F2525_extended.png
    trunk/www/devices/18F2525_18F2525_industrial.png
    trunk/www/devices/18F2525_18LF2525_industrial.png
    trunk/www/devices/18F2525_pins_graph.png
    trunk/www/devices/18F252_18F252_extended.png
    trunk/www/devices/18F252_18F252_industrial.png
    trunk/www/devices/18F252_18LF252_industrial.png
    trunk/www/devices/18F252_pins_graph.png
    trunk/www/devices/18F2539.htm
    trunk/www/devices/18F2539_18F2539_extended.png
    trunk/www/devices/18F2539_18F2539_industrial.png
    trunk/www/devices/18F2539_18LF2539_industrial.png
    trunk/www/devices/18F2539_pins_graph.png
    trunk/www/devices/18F2550_18F2550_industrial.png
    trunk/www/devices/18F2550_18LF2550_industrial.png
    trunk/www/devices/18F2550_pins_graph.png
    trunk/www/devices/18F2553_18F2553_industrial.png
    trunk/www/devices/18F2553_18LF2553_industrial.png
    trunk/www/devices/18F2553_pins_graph.png
    trunk/www/devices/18F258.htm
    trunk/www/devices/18F2580.htm
    trunk/www/devices/18F2580_18F2580_extended.png
    trunk/www/devices/18F2580_18F2580_industrial.png
    trunk/www/devices/18F2580_18LF2580_industrial.png
    trunk/www/devices/18F2580_pins_graph.png
    trunk/www/devices/18F2585.htm
    trunk/www/devices/18F2585_18F2585_extended.png
    trunk/www/devices/18F2585_18F2585_industrial.png
    trunk/www/devices/18F2585_18LF2585_industrial.png
    trunk/www/devices/18F2585_pins_graph.png
    trunk/www/devices/18F258_18F258_extended.png
    trunk/www/devices/18F258_18F258_industrial.png
    trunk/www/devices/18F258_18LF258_industrial.png
    trunk/www/devices/18F258_pins_graph.png
    trunk/www/devices/18F25J10_18F25J10_industrial.png
    trunk/www/devices/18F25J10_18LF25J10_industrial.png
    trunk/www/devices/18F25J10_pins_graph.png
    trunk/www/devices/18F25K20_18F25K20_extended.png
    trunk/www/devices/18F25K20_18F25K20_industrial.png
    trunk/www/devices/18F25K20_pins_graph.png
    trunk/www/devices/18F25K22.htm
    trunk/www/devices/18F25K22_18F25K22_extended.png
    trunk/www/devices/18F25K22_18F25K22_industrial.png
    trunk/www/devices/18F25K22_18LF25K22_extended.png
    trunk/www/devices/18F25K22_18LF25K22_industrial.png
    trunk/www/devices/18F25K22_pins_graph.png
    trunk/www/devices/18F2610.htm
    trunk/www/devices/18F2610_18F2610_extended.png
    trunk/www/devices/18F2610_18F2610_industrial.png
    trunk/www/devices/18F2610_18LF2610_industrial.png
    trunk/www/devices/18F2610_pins_graph.png
    trunk/www/devices/18F2620.htm
    trunk/www/devices/18F2620_18F2620_extended.png
    trunk/www/devices/18F2620_18F2620_industrial.png
    trunk/www/devices/18F2620_18LF2620_industrial.png
    trunk/www/devices/18F2620_pins_graph.png
    trunk/www/devices/18F2680.htm
    trunk/www/devices/18F2680_18F2680_extended.png
    trunk/www/devices/18F2680_18F2680_industrial.png
    trunk/www/devices/18F2680_18LF2680_industrial.png
    trunk/www/devices/18F2680_pins_graph.png
    trunk/www/devices/18F2682.htm
    trunk/www/devices/18F2682_18F2682_extended.png
    trunk/www/devices/18F2682_18F2682_industrial.png
    trunk/www/devices/18F2682_18LF2682_industrial.png
    trunk/www/devices/18F2682_pins_graph.png
    trunk/www/devices/18F2685.htm
    trunk/www/devices/18F2685_18F2685_extended.png
    trunk/www/devices/18F2685_18F2685_industrial.png
    trunk/www/devices/18F2685_18LF2685_industrial.png
    trunk/www/devices/18F2685_pins_graph.png
    trunk/www/devices/18F26K20_18F26K20_extended.png
    trunk/www/devices/18F26K20_18F26K20_industrial.png
    trunk/www/devices/18F26K20_pins_graph.png
    trunk/www/devices/18F26K22.htm
    trunk/www/devices/18F26K22_18F26K22_extended.png
    trunk/www/devices/18F26K22_18F26K22_industrial.png
    trunk/www/devices/18F26K22_18LF26K22_extended.png
    trunk/www/devices/18F26K22_18LF26K22_industrial.png
    trunk/www/devices/18F26K22_pins_graph.png
    trunk/www/devices/18F4220.htm
    trunk/www/devices/18F4220_18F4220_extended.png
    trunk/www/devices/18F4220_18F4220_industrial.png
    trunk/www/devices/18F4220_18LF4220_industrial.png
    trunk/www/devices/18F4220_pins_graph.png
    trunk/www/devices/18F4221.htm
    trunk/www/devices/18F4221_18F4221_extended.png
    trunk/www/devices/18F4221_18F4221_industrial.png
    trunk/www/devices/18F4221_18LF4221_industrial.png
    trunk/www/devices/18F4221_pins_graph.png
    trunk/www/devices/18F4320.htm
    trunk/www/devices/18F4320_18F4320_extended.png
    trunk/www/devices/18F4320_18F4320_industrial.png
    trunk/www/devices/18F4320_18LF4320_industrial.png
    trunk/www/devices/18F4320_pins_graph.png
    trunk/www/devices/18F4321.htm
    trunk/www/devices/18F4321_18F4321_extended.png
    trunk/www/devices/18F4321_18F4321_industrial.png
    trunk/www/devices/18F4321_18LF4321_industrial.png
    trunk/www/devices/18F4321_pins_graph.png
    trunk/www/devices/18F4331.htm
    trunk/www/devices/18F4331_18F4331_extended.png
    trunk/www/devices/18F4331_18F4331_industrial.png
    trunk/www/devices/18F4331_18LF4331_industrial.png
    trunk/www/devices/18F4331_pins_graph.png
    trunk/www/devices/18F43K20_18F43K20_extended.png
    trunk/www/devices/18F43K20_18F43K20_industrial.png
    trunk/www/devices/18F43K20_pins_graph.png
    trunk/www/devices/18F43K22.htm
    trunk/www/devices/18F43K22_18F43K22_extended.png
    trunk/www/devices/18F43K22_18F43K22_industrial.png
    trunk/www/devices/18F43K22_18LF43K22_extended.png
    trunk/www/devices/18F43K22_18LF43K22_industrial.png
    trunk/www/devices/18F43K22_pins_graph.png
    trunk/www/devices/18F4410.htm
    trunk/www/devices/18F4410_18F4410_extended.png
    trunk/www/devices/18F4410_18F4410_industrial.png
    trunk/www/devices/18F4410_18LF4410_industrial.png
    trunk/www/devices/18F4410_pins_graph.png
    trunk/www/devices/18F442.htm
    trunk/www/devices/18F4420.htm
    trunk/www/devices/18F4420_18F4420_extended.png
    trunk/www/devices/18F4420_18F4420_industrial.png
    trunk/www/devices/18F4420_18LF4420_industrial.png
    trunk/www/devices/18F4420_pins_graph.png
    trunk/www/devices/18F4423_18F4423_industrial.png
    trunk/www/devices/18F4423_18LF4423_industrial.png
    trunk/www/devices/18F4423_pins_graph.png
    trunk/www/devices/18F442_18F442_extended.png
    trunk/www/devices/18F442_18F442_industrial.png
    trunk/www/devices/18F442_18LF442_industrial.png
    trunk/www/devices/18F442_pins_graph.png
    trunk/www/devices/18F4431.htm
    trunk/www/devices/18F4431_18F4431_extended.png
    trunk/www/devices/18F4431_18F4431_industrial.png
    trunk/www/devices/18F4431_18LF4431_industrial.png
    trunk/www/devices/18F4431_pins_graph.png
    trunk/www/devices/18F4439.htm
    trunk/www/devices/18F4439_18F4439_extended.png
    trunk/www/devices/18F4439_18F4439_industrial.png
    trunk/www/devices/18F4439_18LF4439_industrial.png
    trunk/www/devices/18F4439_pins_graph.png
    trunk/www/devices/18F4450_18F4450_industrial.png
    trunk/www/devices/18F4450_18LF4450_industrial.png
    trunk/www/devices/18F4450_pins_graph.png
    trunk/www/devices/18F4455_18F4455_industrial.png
    trunk/www/devices/18F4455_18LF4455_industrial.png
    trunk/www/devices/18F4455_pins_graph.png
    trunk/www/devices/18F4458_18F4458_industrial.png
    trunk/www/devices/18F4458_18LF4458_industrial.png
    trunk/www/devices/18F4458_pins_graph.png
    trunk/www/devices/18F448.htm
    trunk/www/devices/18F4480.htm
    trunk/www/devices/18F4480_18F4480_extended.png
    trunk/www/devices/18F4480_18F4480_industrial.png
    trunk/www/devices/18F4480_18LF4480_industrial.png
    trunk/www/devices/18F4480_pins_graph.png
    trunk/www/devices/18F448_18F448_extended.png
    trunk/www/devices/18F448_18F448_industrial.png
    trunk/www/devices/18F448_18LF448_industrial.png
    trunk/www/devices/18F448_pins_graph.png
    trunk/www/devices/18F44J10_18F44J10_industrial.png
    trunk/www/devices/18F44J10_18LF44J10_industrial.png
    trunk/www/devices/18F44J10_pins_graph.png
    trunk/www/devices/18F44K20_18F44K20_extended.png
    trunk/www/devices/18F44K20_18F44K20_industrial.png
    trunk/www/devices/18F44K20_pins_graph.png
    trunk/www/devices/18F44K22.htm
    trunk/www/devices/18F44K22_18F44K22_extended.png
    trunk/www/devices/18F44K22_18F44K22_industrial.png
    trunk/www/devices/18F44K22_18LF44K22_extended.png
    trunk/www/devices/18F44K22_18LF44K22_industrial.png
    trunk/www/devices/18F44K22_pins_graph.png
    trunk/www/devices/18F4510.htm
    trunk/www/devices/18F4510_18F4510_extended.png
    trunk/www/devices/18F4510_18F4510_industrial.png
    trunk/www/devices/18F4510_18LF4510_industrial.png
    trunk/www/devices/18F4510_pins_graph.png
    trunk/www/devices/18F4515.htm
    trunk/www/devices/18F4515_18F4515_extended.png
    trunk/www/devices/18F4515_18F4515_industrial.png
    trunk/www/devices/18F4515_18LF4515_industrial.png
    trunk/www/devices/18F4515_pins_graph.png
    trunk/www/devices/18F452.htm
    trunk/www/devices/18F4520.htm
    trunk/www/devices/18F4520_18F4520_extended.png
    trunk/www/devices/18F4520_18F4520_industrial.png
    trunk/www/devices/18F4520_18LF4520_industrial.png
    trunk/www/devices/18F4520_pins_graph.png
    trunk/www/devices/18F4523_18F4523_industrial.png
    trunk/www/devices/18F4523_18LF4523_industrial.png
    trunk/www/devices/18F4523_pins_graph.png
    trunk/www/devices/18F4525.htm
    trunk/www/devices/18F4525_18F4525_extended.png
    trunk/www/devices/18F4525_18F4525_industrial.png
    trunk/www/devices/18F4525_18LF4525_industrial.png
    trunk/www/devices/18F4525_pins_graph.png
    trunk/www/devices/18F452_18F452_extended.png
    trunk/www/devices/18F452_18F452_industrial.png
    trunk/www/devices/18F452_18LF452_industrial.png
    trunk/www/devices/18F452_pins_graph.png
    trunk/www/devices/18F4539.htm
    trunk/www/devices/18F4539_18F4539_extended.png
    trunk/www/devices/18F4539_18F4539_industrial.png
    trunk/www/devices/18F4539_18LF4539_industrial.png
    trunk/www/devices/18F4539_pins_graph.png
    trunk/www/devices/18F4550_18F4550_industrial.png
    trunk/www/devices/18F4550_18LF4550_industrial.png
    trunk/www/devices/18F4550_pins_graph.png
    trunk/www/devices/18F4553_18F4553_industrial.png
    trunk/www/devices/18F4553_18LF4553_industrial.png
    trunk/www/devices/18F4553_pins_graph.png
    trunk/www/devices/18F458.htm
    trunk/www/devices/18F4580.htm
    trunk/www/devices/18F4580_18F4580_extended.png
    trunk/www/devices/18F4580_18F4580_industrial.png
    trunk/www/devices/18F4580_18LF4580_industrial.png
    trunk/www/devices/18F4580_pins_graph.png
    trunk/www/devices/18F4585.htm
    trunk/www/devices/18F4585_18F4585_extended.png
    trunk/www/devices/18F4585_18F4585_industrial.png
    trunk/www/devices/18F4585_18LF4585_industrial.png
    trunk/www/devices/18F4585_pins_graph.png
    trunk/www/devices/18F458_18F458_extended.png
    trunk/www/devices/18F458_18F458_industrial.png
    trunk/www/devices/18F458_18LF458_industrial.png
    trunk/www/devices/18F458_pins_graph.png
    trunk/www/devices/18F45J10_18F45J10_industrial.png
    trunk/www/devices/18F45J10_18LF45J10_industrial.png
    trunk/www/devices/18F45J10_pins_graph.png
    trunk/www/devices/18F45K20_18F45K20_extended.png
    trunk/www/devices/18F45K20_18F45K20_industrial.png
    trunk/www/devices/18F45K20_pins_graph.png
    trunk/www/devices/18F45K22.htm
    trunk/www/devices/18F45K22_18F45K22_extended.png
    trunk/www/devices/18F45K22_18F45K22_industrial.png
    trunk/www/devices/18F45K22_18LF45K22_extended.png
    trunk/www/devices/18F45K22_18LF45K22_industrial.png
    trunk/www/devices/18F45K22_pins_graph.png
    trunk/www/devices/18F4610.htm
    trunk/www/devices/18F4610_18F4610_extended.png
    trunk/www/devices/18F4610_18F4610_industrial.png
    trunk/www/devices/18F4610_18LF4610_industrial.png
    trunk/www/devices/18F4610_pins_graph.png
    trunk/www/devices/18F4620.htm
    trunk/www/devices/18F4620_18F4620_extended.png
    trunk/www/devices/18F4620_18F4620_industrial.png
    trunk/www/devices/18F4620_18LF4620_industrial.png
    trunk/www/devices/18F4620_pins_graph.png
    trunk/www/devices/18F4680.htm
    trunk/www/devices/18F4680_18F4680_extended.png
    trunk/www/devices/18F4680_18F4680_industrial.png
    trunk/www/devices/18F4680_18LF4680_industrial.png
    trunk/www/devices/18F4680_pins_graph.png
    trunk/www/devices/18F4682.htm
    trunk/www/devices/18F4682_18F4682_extended.png
    trunk/www/devices/18F4682_18F4682_industrial.png
    trunk/www/devices/18F4682_18LF4682_industrial.png
    trunk/www/devices/18F4682_pins_graph.png
    trunk/www/devices/18F4685.htm
    trunk/www/devices/18F4685_18F4685_extended.png
    trunk/www/devices/18F4685_18F4685_industrial.png
    trunk/www/devices/18F4685_18LF4685_industrial.png
    trunk/www/devices/18F4685_pins_graph.png
    trunk/www/devices/18F46K20_18F46K20_extended.png
    trunk/www/devices/18F46K20_18F46K20_industrial.png
    trunk/www/devices/18F46K20_pins_graph.png
    trunk/www/devices/18F46K22.htm
    trunk/www/devices/18F46K22_18F46K22_extended.png
    trunk/www/devices/18F46K22_18F46K22_industrial.png
    trunk/www/devices/18F46K22_18LF46K22_extended.png
    trunk/www/devices/18F46K22_18LF46K22_industrial.png
    trunk/www/devices/18F46K22_pins_graph.png
    trunk/www/devices/18F6310.htm
    trunk/www/devices/18F6310_18F6310_extended.png
    trunk/www/devices/18F6310_18F6310_industrial.png
    trunk/www/devices/18F6310_18LF6310_industrial.png
    trunk/www/devices/18F6390.htm
    trunk/www/devices/18F6390_18F6390_extended.png
    trunk/www/devices/18F6390_18F6390_industrial.png
    trunk/www/devices/18F6390_18LF6390_industrial.png
    trunk/www/devices/18F6393.htm
    trunk/www/devices/18F6393_18F6393_extended.png
    trunk/www/devices/18F6393_18F6393_industrial.png
    trunk/www/devices/18F6393_18LF6393_industrial.png
    trunk/www/devices/18F63J11_18F63J11_industrial.png
    trunk/www/devices/18F63J90_18F63J90_industrial.png
    trunk/www/devices/18F6410.htm
    trunk/www/devices/18F6410_18F6410_extended.png
    trunk/www/devices/18F6410_18F6410_industrial.png
    trunk/www/devices/18F6410_18LF6410_industrial.png
    trunk/www/devices/18F6490.htm
    trunk/www/devices/18F6490_18F6490_extended.png
    trunk/www/devices/18F6490_18F6490_industrial.png
    trunk/www/devices/18F6490_18LF6490_industrial.png
    trunk/www/devices/18F6493.htm
    trunk/www/devices/18F6493_18F6493_extended.png
    trunk/www/devices/18F6493_18F6493_industrial.png
    trunk/www/devices/18F6493_18LF6493_industrial.png
    trunk/www/devices/18F64J11_18F64J11_industrial.png
    trunk/www/devices/18F64J90_18F64J90_industrial.png
    trunk/www/devices/18F6520.htm
    trunk/www/devices/18F6520_18F6520_extended.png
    trunk/www/devices/18F6520_18F6520_industrial.png
    trunk/www/devices/18F6520_18LF6520_industrial.png
    trunk/www/devices/18F6525.htm
    trunk/www/devices/18F6525_18F6525_extended.png
    trunk/www/devices/18F6525_18F6525_industrial.png
    trunk/www/devices/18F6525_18LF6525_industrial.png
    trunk/www/devices/18F6527.htm
    trunk/www/devices/18F6527_18F6527_extended.png
    trunk/www/devices/18F6527_18F6527_industrial.png
    trunk/www/devices/18F6527_18LF6527_industrial.png
    trunk/www/devices/18F6585.htm
    trunk/www/devices/18F6585_18F6585_extended.png
    trunk/www/devices/18F6585_18F6585_industrial.png
    trunk/www/devices/18F6585_18LF6585_industrial.png
    trunk/www/devices/18F65J10_18F65J10_industrial.png
    trunk/www/devices/18F65J11_18F65J11_industrial.png
    trunk/www/devices/18F65J15_18F65J15_industrial.png
    trunk/www/devices/18F65J50_18F65J50_industrial.png
    trunk/www/devices/18F65J90_18F65J90_industrial.png
    trunk/www/devices/18F6620.htm
    trunk/www/devices/18F6620_18F6620_extended.png
    trunk/www/devices/18F6620_18F6620_industrial.png
    trunk/www/devices/18F6620_18LF6620_industrial.png
    trunk/www/devices/18F6621.htm
    trunk/www/devices/18F6621_18F6621_extended.png
    trunk/www/devices/18F6621_18F6621_industrial.png
    trunk/www/devices/18F6621_18LF6621_industrial.png
    trunk/www/devices/18F6622.htm
    trunk/www/devices/18F6622_18F6622_extended.png
    trunk/www/devices/18F6622_18F6622_industrial.png
    trunk/www/devices/18F6622_18LF6622_industrial.png
    trunk/www/devices/18F6627.htm
    trunk/www/devices/18F6627_18F6627_extended.png
    trunk/www/devices/18F6627_18F6627_industrial.png
    trunk/www/devices/18F6627_18LF6627_industrial.png
    trunk/www/devices/18F6680.htm
    trunk/www/devices/18F6680_18F6680_extended.png
    trunk/www/devices/18F6680_18F6680_industrial.png
    trunk/www/devices/18F6680_18LF6680_industrial.png
    trunk/www/devices/18F66J10_18F66J10_industrial.png
    trunk/www/devices/18F66J11_18F66J11_industrial.png
    trunk/www/devices/18F66J15_18F66J15_industrial.png
    trunk/www/devices/18F66J16_18F66J16_industrial.png
    trunk/www/devices/18F66J50_18F66J50_industrial.png
    trunk/www/devices/18F66J55_18F66J55_industrial.png
    trunk/www/devices/18F66J60_18F66J60_industrial.png
    trunk/www/devices/18F66J60_18LF66J60_industrial.png
    trunk/www/devices/18F66J65_18F66J65_industrial.png
    trunk/www/devices/18F66J65_18LF66J65_industrial.png
    trunk/www/devices/18F6720.htm
    trunk/www/devices/18F6720_18F67...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2908] trunk/www/Changelog

From: <az...@us...> - 2012-06-04 00:50:54

Revision: 2908
          http://piklab.svn.sourceforge.net/piklab/?rev=2908&view=rev
Author:   azhyd
Date:     2012-06-04 00:50:48 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/Changelog

Modified: trunk/www/Changelog
===================================================================
--- trunk/www/Changelog	2012-06-04 00:50:07 UTC (rev 2907)
+++ trunk/www/Changelog	2012-06-04 00:50:48 UTC (rev 2908)
@@ -1,8 +1,9 @@
-0.15.13 (9 April 2012)
+0.16.0 (3 June 2012)
+* port to KDE4
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
 * added support for 10F320/322, 12F617/752
 * added support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]
-* added support for direct programming of 12F1822/16F182X
+* added support for direct programming of 12F1822/16F182X [with help from Michael Vrolijk]
 * added device family "enhanced mid-range" in device chooser
 
 0.15.12 (19 February 2012)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 2 3 4 5 6 > >> (Page 3 of 6)