-MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
-MD5 3437b7fc4093fa6bd9fe3e65165ac48d ChangeLog 648
-MD5 39bf42d6d92a00733f0e09431709a6ef kink-0.2.1.ebuild 574
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kink-0.2.1-compilefix.diff 652 RMD160 bb9a2e0f30c8242b2619dab4ed83cc26adfbd6fb SHA1 5221d4fa85d191293b7367079fc9a5837b20f037 SHA256 397fe054c7cd2a2538ec4a17e8962219ecaefce3f4773b3a3628352fe544da49
MD5 e42a0101174b97b644ed99bda4e4cceb files/kink-0.2.1-compilefix.diff 652
-MD5 211d67758e5494b8b5b5b67c2eb6a6ad files/digest-kink-0.2.1 63
+RMD160 bb9a2e0f30c8242b2619dab4ed83cc26adfbd6fb files/kink-0.2.1-compilefix.diff 652
+SHA256 397fe054c7cd2a2538ec4a17e8962219ecaefce3f4773b3a3628352fe544da49 files/kink-0.2.1-compilefix.diff 652
+AUX kink-0.2.1-libinklevel-0.6.6.patch 8984 RMD160 b885f8beaeab742879fa9fd3203aaa8ac1c2e5dc SHA1 a30de2d8e66471e4e25c65c001d68fc56e31bc2d SHA256 c4eb718f2dab2ac38a1b44f2d337261179db5c4ae369c36a2a41fb40867161b1
+MD5 07762acb33e304850f1a55d45a893132 files/kink-0.2.1-libinklevel-0.6.6.patch 8984
+RMD160 b885f8beaeab742879fa9fd3203aaa8ac1c2e5dc files/kink-0.2.1-libinklevel-0.6.6.patch 8984
+SHA256 c4eb718f2dab2ac38a1b44f2d337261179db5c4ae369c36a2a41fb40867161b1 files/kink-0.2.1-libinklevel-0.6.6.patch 8984
+DIST kink-0.2.1.tar.bz2 419012 RMD160 ed61efc29fd68a91b876553d31c775dea9483e38 SHA1 2314a3039588bb04a5f7f1273acb82a8eaf5996d SHA256 2c0eb6dade582b85a8938eb928d868d8ed81eaa55f16c2b469b0bf0cff9ad7bc
+EBUILD kink-0.2.1-r1.ebuild 595 RMD160 f70bf8701bbc8113869be287f20abf2f539e3940 SHA1 db9d61ca086f7a4a8accfffe2abfb218faa0ed35 SHA256 5a353dd6146a0e298bc12b87f47f8ec50fbbd7c55d78b03a3dc249af0b70d837
+MD5 b3b8b65d1ba7a27be4b27a58e8e45f60 kink-0.2.1-r1.ebuild 595
+RMD160 f70bf8701bbc8113869be287f20abf2f539e3940 kink-0.2.1-r1.ebuild 595
+SHA256 5a353dd6146a0e298bc12b87f47f8ec50fbbd7c55d78b03a3dc249af0b70d837 kink-0.2.1-r1.ebuild 595
+EBUILD kink-0.2.1.ebuild 576 RMD160 930facea23fc3d3dc7cdbc705987d8c7fbb0895c SHA1 8ef282a5f8c01ad8dbfc3485cfb7ff013f91ea42 SHA256 aea3621bd33f99623c96c4ce863e79762aa1f10976a904caa27cc82e8fcb47db
+MD5 c6aee0f49448cc92d8708b2cc08b1a20 kink-0.2.1.ebuild 576
+RMD160 930facea23fc3d3dc7cdbc705987d8c7fbb0895c kink-0.2.1.ebuild 576
+SHA256 aea3621bd33f99623c96c4ce863e79762aa1f10976a904caa27cc82e8fcb47db kink-0.2.1.ebuild 576
+MISC ChangeLog 942 RMD160 6c916c5eb815896b06150c7cff85412fda9f750c SHA1 a6f2537e0d3aba417e3109e5cff342b5a5f4215b SHA256 917b06474c4440b69c2f2fb3bbb96dfb694e73d3791e23eb71c0a69097b58b91
+MD5 d252a8400627ba9f62585f73b0e7cc34 ChangeLog 942
+RMD160 6c916c5eb815896b06150c7cff85412fda9f750c ChangeLog 942
+SHA256 917b06474c4440b69c2f2fb3bbb96dfb694e73d3791e23eb71c0a69097b58b91 ChangeLog 942
+MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
+MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
+RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
+SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
+MD5 4f8b7d14555356953769bc7da0d96602 files/digest-kink-0.2.1 235
+RMD160 b4aa8537d80c40576bdc5a0f1d03b4f689d9543a files/digest-kink-0.2.1 235
+SHA256 21bf8f115f2e4b51e31a157dc893d50257ccc5ff24bb50cf5cb2885b64f021a4 files/digest-kink-0.2.1 235
+MD5 4f8b7d14555356953769bc7da0d96602 files/digest-kink-0.2.1-r1 235
+RMD160 b4aa8537d80c40576bdc5a0f1d03b4f689d9543a files/digest-kink-0.2.1-r1 235
+SHA256 21bf8f115f2e4b51e31a157dc893d50257ccc5ff24bb50cf5cb2885b64f021a4 files/digest-kink-0.2.1-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFn/QyntT9W3vfTuoRApkgAJ9vd2Ss1CbLMzsB+pKUoF7blFptoACcCGmn
+q3mZpxtRwKJOsFyYkmKUmJ0=
+=8GIz
+-----END PGP SIGNATURE-----
--- /dev/null
+# Marcus D. Hanwell <cryos@gentoo.org> 6 January 2007.
+# Fixes to allow kink to compile against the new API in libinklevel-0.6.6
+diff -u ../kink-0.2.1-orig/kink/kink.cpp kink/kink.cpp
+--- ../kink-0.2.1-orig/kink/kink.cpp 2007-01-06 14:04:45.000000000 +0000
++++ kink/kink.cpp 2007-01-06 18:47:06.000000000 +0000
+@@ -80,10 +80,10 @@
+ switch(callback)
+ {
+ case OK:
+- add_device_to_list(PARPORT,i,level.model);
++ add_device_to_list(PARPORT, i, level.model);
+ break;
+ case PRINTER_NOT_SUPPORTED:
+- add_device_to_list(PARPORT,i,(unsigned char *)"Unsupported device");
++ add_device_to_list(PARPORT,i,(char *)"Unsupported device");
+ break;
+ }
+ }
+@@ -95,10 +95,10 @@
+ switch(callback)
+ {
+ case OK:
+- add_device_to_list(USB,i,level.model);
++ add_device_to_list(USB , i, (level.model));
+ break;
+ case PRINTER_NOT_SUPPORTED:
+- add_device_to_list(USB,i,(unsigned char *)"Unsupported device");
++ add_device_to_list(USB, i, (char *)"Unsupported device");
+ break;
+ }
+ }
+@@ -150,7 +150,7 @@
+ \fn KInk::add_device_to_list(void)
+ Add a device to the combo box list
+ */
+-void KInk::add_device_to_list(int type, int port, unsigned char *model)
++void KInk::add_device_to_list(int type, int port, char *model)
+ {
+ listed_devices[listed_count].device_type = type;
+ listed_devices[listed_count].device_port = port;
+@@ -203,116 +203,79 @@
+ grpLevels->show();
+
+ callback=get_ink_level(last_type,last_port,&level);
+- switch(callback)
++ if (callback == OK)
+ {
+- case OK:
+-
+- if(level.black == 0 &&
+- level.color == 0 &&
+- level.cyan == 0 &&
+- level.magenta == 0 &&
+- level.yellow == 0 &&
+- level.photo == 0 &&
+- level.photocyan == 0 &&
+- level.photomagenta == 0 &&
+- level.photoyellow == 0)
+- level.type = RESPONSE_INVALID;
+-
+- switch (level.type) {
+- case ONE_COLOR_FOUND:
+- barColor->setEnabled(true);
+- barColor->setProgress(level.color);
+- break;
+- case ONE_BLACK_COLOR_FOUND:
+- barBlack->setEnabled(true);
+- barBlack->setProgress(level.black);
+- break;
+- case TWO_COLORS_FOUND:
+- barBlack->setEnabled(true);
+- barColor->setEnabled(true);
+- barBlack->setProgress(level.black);
+- barColor->setProgress(level.color);
+- break;
+- case TWO_PHOTO_COLORS_FOUND:
+- barPhoto->setEnabled(true);
+- barColor->setEnabled(true);
+- barPhoto->setProgress(level.photo);
+- barColor->setProgress(level.color);
+- break;
+- case THREE_COLORS_FOUND:
+- barCyan->setEnabled(true);
+- barMagenta->setEnabled(true);
+- barYellow->setEnabled(true);
+- barCyan->setProgress(level.cyan);
+- barMagenta->setProgress(level.magenta);
+- barYellow->setProgress(level.yellow);
+- break;
+- case FOUR_COLORS_FOUND:
+- barBlack->setEnabled(true);
+- barCyan->setEnabled(true);
+- barMagenta->setEnabled(true);
+- barYellow->setEnabled(true);
+- barBlack->setProgress(level.black);
+- barCyan->setProgress(level.cyan);
+- barMagenta->setProgress(level.magenta);
+- barYellow->setProgress(level.yellow);
+- break;
+- case SIX_COLORS_FOUND:
+- barBlack->setEnabled(true);
+- barPhotoCyan->setEnabled(true);
+- barPhotoMagenta->setEnabled(true);
+- barCyan->setEnabled(true);
+- barMagenta->setEnabled(true);
+- barYellow->setEnabled(true);
+- barBlack->setProgress(level.black);
+- barPhotoCyan->setProgress(level.photocyan);
+- barPhotoMagenta->setProgress(level.photomagenta);
+- barCyan->setProgress(level.cyan);
+- barMagenta->setProgress(level.magenta);
+- barYellow->setProgress(level.yellow);
+- break;
+- case SEVEN_COLORS_FOUND:
+- barBlack->setEnabled(true);
+- barPhotoCyan->setEnabled(true);
+- barPhotoMagenta->setEnabled(true);
+- barPhotoYellow->setEnabled(true);
+- barCyan->setEnabled(true);
+- barMagenta->setEnabled(true);
+- barYellow->setEnabled(true);
+- barBlack->setProgress(level.black);
+- barPhotoCyan->setProgress(level.photocyan);
+- barPhotoMagenta->setProgress(level.photomagenta);
+- barPhotoYellow->setProgress(level.photoyellow);
+- barCyan->setProgress(level.cyan);
+- barMagenta->setProgress(level.magenta);
+- barYellow->setProgress(level.yellow);
+- break;
+- case RESPONSE_INVALID:
+- show_error(tr2i18n("<b>Invalid response read from device</b><br><br>Your printer reported that all ink tanks are empty or your printer is currently switched-off.<br><br>Power-on your device and verify the correct installation of cartdriges, then try again clicking <b>Update</b>."));
++ QProgressBar* ptrBar = 0;
++ for (int i = 0; i < MAX_CARTRIDGE_TYPES; i++)
++ {
++ switch (level.levels[i][INDEX_TYPE])
++ {
++ case CARTRIDGE_BLACK:
++ ptrBar = barBlack;
++ break;
++ case CARTRIDGE_COLOR:
++ ptrBar = barColor;
++ break;
++ case CARTRIDGE_PHOTO:
++ ptrBar = barPhoto;
++ break;
++ case CARTRIDGE_CYAN:
++ ptrBar = barCyan;
++ break;
++ case CARTRIDGE_MAGENTA:
++ ptrBar = barMagenta;
++ break;
++ case CARTRIDGE_YELLOW:
++ ptrBar = barYellow;
++ break;
++ case CARTRIDGE_PHOTOBLACK:
++ // Not implemented yet - add it?
++ break;
++ case CARTRIDGE_PHOTOCYAN:
++ ptrBar = barPhotoCyan;
++ break;
++ case CARTRIDGE_PHOTOMAGENTA:
++ ptrBar = barPhotoMagenta;
++ break;
++ case CARTRIDGE_PHOTOYELLOW:
++ ptrBar = barPhotoYellow;
++ break;
++ }
++ if (ptrBar)
++ {
++ ptrBar->setEnabled(true);
++ ptrBar->setProgress(level.levels[i][INDEX_LEVEL]);
++ }
++ ptrBar = 0;
+ }
+- break;
++ }
++ else
++ {
++// show_error(tr2i18n("<b>Invalid response read from device</b><br><br>Your printer reported that all ink tanks are empty or your printer is currently switched-off.<br><br>Power-on your device and verify the correct installation of cartdriges, then try again clicking <b>Update</b>."));
++ switch(callback)
++ {
++ case DEV_PARPORT_INACCESSIBLE:
++ case DEV_LP_INACCESSIBLE:
++ case COULD_NOT_GET_DEVICE_ID:
++ case DEV_USB_LP_INACCESSIBLE:
++ case COULD_NOT_WRITE_TO_PRINTER:
++ case COULD_NOT_READ_FROM_PRINTER:
++ case ERROR:
++ case UNKNOWN_PORT_SPECIFIED:
++ case NO_DEVICE_CLASS_FOUND:
++ case NO_CMD_TAG_FOUND:
++ case NO_PRINTER_FOUND:
++ case COULD_NOT_PARSE_RESPONSE_FROM_PRINTER:
++ show_error(tr2i18n("<b>Generic error</b><br><br>An error has occured communicating with the selected device. Click <b>Detect</b> and <b>Update</b> to refresh KInk status and try again. If the problem persists, e-mail me a description of the situation and all that can be helpful to me for reconstructing your execution environment."));
++ break;
++
++ case NO_INK_LEVEL_FOUND:
++ show_error(tr2i18n("<b>Cannot read ink level from device</b><br><br>Cannot retrieve ink levels from the selected device. Ensure your printer is switched on and click on <b>Update</b> to try again."));
++ break;
+
+- case DEV_PARPORT_INACCESSIBLE:
+- case DEV_LP_INACCESSIBLE:
+- case COULD_NOT_GET_DEVICE_ID:
+- case DEV_USB_LP_INACCESSIBLE:
+- case COULD_NOT_WRITE_TO_PRINTER:
+- case COULD_NOT_READ_FROM_PRINTER:
+- case ERROR:
+- case UNKNOWN_PORT_SPECIFIED:
+- case NO_DEVICE_CLASS_FOUND:
+- case NO_CMD_TAG_FOUND:
+- case NO_PRINTER_FOUND:
+- case COULD_NOT_PARSE_RESPONSE_FROM_PRINTER:
+- show_error(tr2i18n("<b>Generic error</b><br><br>An error has occured communicating with the selected device. Click <b>Detect</b> and <b>Update</b> to refresh KInk status and try again. If the problem persists, e-mail me a description of the situation and all that can be helpful to me for reconstructing your execution environment."));
+- break;
+-
+- case NO_INK_LEVEL_FOUND:
+- show_error(tr2i18n("<b>Cannot read ink level from device</b><br><br>Cannot retrieve ink levels from the selected device. Ensure your printer is switched on and click on <b>Update</b> to try again."));
+- break;
+-
+- case PRINTER_NOT_SUPPORTED:
+- show_error(tr2i18n("<b>Unsupported printer!</b><br><br>Selected printer is not supported by this version of libinklevel. Take a look to <a href='http://home.arcor.de/markusheinz'>http://home.arcor.de/markusheinz</a> for a complete list of devices supported by your version of libinklevel."));
+- break;
+- }
++ case PRINTER_NOT_SUPPORTED:
++ show_error(tr2i18n("<b>Unsupported printer!</b><br><br>Selected printer is not supported by this version of libinklevel. Take a look to <a href='http://home.arcor.de/markusheinz'>http://home.arcor.de/markusheinz</a> for a complete list of devices supported by your version of libinklevel."));
++ break;
++ }
++ }
+ }
+diff -u ../kink-0.2.1-orig/kink/kink.h kink/kink.h
+--- ../kink-0.2.1-orig/kink/kink.h 2007-01-06 14:04:45.000000000 +0000
++++ kink/kink.h 2007-01-06 18:20:59.000000000 +0000
+@@ -67,7 +67,7 @@
+ DEVICE_INFO listed_devices[PARPORT_LAST_PORT + USB_LAST_PORT];
+
+ private:
+- void add_device_to_list(int type, int port, unsigned char *model);
++ void add_device_to_list(int type, int port, char *model);
+ void show_error(QString errStr);
+ void update_view(void);
+ };
projects / gentoo.git / commitdiff