From 7898df7a8ed02f64285e353b025ffea92005cab4 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Sun, 3 Nov 2019 23:23:34 -0800 Subject: [PATCH] Changed icons, added Todo, fixed location of icons in properties combo box --- DataModelInstance.cpp | 278 +++++++++++++++++++++--------------------- GroupInstance.cpp | 2 + Instance.cpp | 2 +- PVInstance.cpp | 1 + Parts.bmp | Bin 26934 -> 11574 bytes PropertyWindow.cpp | 4 +- WorkspaceInstance.cpp | 1 - main.cpp | 11 +- 8 files changed, 151 insertions(+), 148 deletions(-) diff --git a/DataModelInstance.cpp b/DataModelInstance.cpp index 0c10735..b92b56a 100644 --- a/DataModelInstance.cpp +++ b/DataModelInstance.cpp @@ -27,7 +27,7 @@ DataModelInstance::DataModelInstance(void) workspace->setParent(this); level->setParent(this); _loadedFileName="..//skooter.rbxm"; - listicon = 1; + listicon = 5; } @@ -91,149 +91,149 @@ Color3 bcToRGB(short bc) { switch(bc) { - case 1: return Color3(0.94901967048645,0.95294123888016,0.95294123888016); - case 2: return Color3(0.63137257099152,0.64705884456635,0.63529413938522); - case 3: return Color3(0.9764706492424,0.91372555494308,0.60000002384186); - case 5: return Color3(0.84313732385635,0.77254909276962,0.60392159223557); - case 6: return Color3(0.7607843875885,0.85490202903748,0.72156864404678); - case 9: return Color3(0.90980398654938,0.7294117808342,0.78431379795074); - case 11: return Color3(0.50196081399918,0.73333334922791,0.85882359743118); - case 12: return Color3(0.79607850313187,0.51764708757401,0.258823543787); - case 18: return Color3(0.80000007152557,0.55686277151108,0.41176474094391); - case 21: return Color3(0.76862752437592,0.15686275064945,0.10980392992496); - case 22: return Color3(0.76862752437592,0.43921571969986,0.62745100259781); - case 23: return Color3(0.050980396568775,0.41176474094391,0.6745098233223); - case 24: return Color3(0.96078437566757,0.80392163991928,0.18823531270027); - case 25: return Color3(0.38431376218796,0.27843138575554,0.19607844948769); - case 26: return Color3(0.10588236153126,0.16470588743687,0.20784315466881); - case 27: return Color3(0.42745101451874,0.43137258291245,0.42352944612503); - case 28: return Color3(0.15686275064945,0.49803924560547,0.27843138575554); - case 29: return Color3(0.63137257099152,0.76862752437592,0.54901963472366); - case 36: return Color3(0.95294123888016,0.8117647767067,0.60784316062927); - case 37: return Color3(0.29411765933037,0.59215688705444,0.29411765933037); - case 38: return Color3(0.62745100259781,0.37254902720451,0.20784315466881); - case 39: return Color3(0.75686281919479,0.79215693473816,0.8705883026123); - case 40: return Color3(0.92549026012421,0.92549026012421,0.92549026012421); - case 41: return Color3(0.80392163991928,0.32941177487373,0.29411765933037); - case 42: return Color3(0.75686281919479,0.87450987100601,0.94117653369904); - case 43: return Color3(0.48235297203064,0.71372550725937,0.90980398654938); - case 44: return Color3(0.96862751245499,0.94509810209274,0.55294120311737); - case 45: return Color3(0.70588237047195,0.82352948188782,0.89411771297455); - case 47: return Color3(0.85098046064377,0.52156865596771,0.42352944612503); - case 48: return Color3(0.51764708757401,0.71372550725937,0.55294120311737); - case 49: return Color3(0.97254908084869,0.94509810209274,0.51764708757401); - case 50: return Color3(0.92549026012421,0.90980398654938,0.8705883026123); - case 100: return Color3(0.93333339691162,0.76862752437592,0.71372550725937); - case 101: return Color3(0.85490202903748,0.52549022436142,0.47843140363693); - case 102: return Color3(0.43137258291245,0.60000002384186,0.79215693473816); - case 103: return Color3(0.78039222955704,0.75686281919479,0.71764707565308); - case 104: return Color3(0.41960787773132,0.19607844948769,0.48627454042435); - case 105: return Color3(0.88627457618713,0.60784316062927,0.25098040699959); - case 106: return Color3(0.85490202903748,0.52156865596771,0.2549019753933); - case 107: return Color3(0,0.56078433990479,0.61176472902298); - case 108: return Color3(0.4078431725502,0.36078432202339,0.26274511218071); - case 110: return Color3(0.26274511218071,0.32941177487373,0.57647061347961); - case 111: return Color3(0.74901962280273,0.71764707565308,0.69411766529083); - case 112: return Color3(0.4078431725502,0.45490199327469,0.6745098233223); - case 113: return Color3(0.89411771297455,0.678431391716,0.78431379795074); - case 115: return Color3(0.78039222955704,0.82352948188782,0.23529413342476); - case 116: return Color3(0.33333334326744,0.64705884456635,0.68627452850342); - case 118: return Color3(0.71764707565308,0.84313732385635,0.83529418706894); - case 119: return Color3(0.64313727617264,0.74117648601532,0.27843138575554); - case 120: return Color3(0.85098046064377,0.89411771297455,0.65490198135376); - case 121: return Color3(0.90588241815567,0.6745098233223,0.34509804844856); - case 123: return Color3(0.82745105028152,0.43529415130615,0.29803922772408); - case 124: return Color3(0.57254904508591,0.22352942824364,0.47058826684952); - case 125: return Color3(0.91764712333679,0.72156864404678,0.57254904508591); - case 126: return Color3(0.64705884456635,0.64705884456635,0.79607850313187); - case 127: return Color3(0.86274516582489,0.73725491762161,0.50588238239288); - case 128: return Color3(0.68235296010971,0.47843140363693,0.34901961684227); - case 131: return Color3(0.61176472902298,0.63921570777893,0.65882354974747); - case 133: return Color3(0.83529418706894,0.45098042488098,0.23921570181847); - case 134: return Color3(0.84705889225006,0.8666667342186,0.33725491166115); - case 135: return Color3(0.45490199327469,0.52549022436142,0.61568629741669); - case 136: return Color3(0.52941179275513,0.48627454042435,0.56470590829849); - case 137: return Color3(0.87843143939972,0.59607845544815,0.39215689897537); - case 138: return Color3(0.58431375026703,0.54117649793625,0.45098042488098); - case 140: return Color3(0.12549020349979,0.22745099663734,0.33725491166115); - case 141: return Color3(0.15294118225574,0.27450981736183,0.17647059261799); - case 143: return Color3(0.8117647767067,0.88627457618713,0.96862751245499); - case 145: return Color3(0.47450983524323,0.53333336114883,0.63137257099152); - case 146: return Color3(0.58431375026703,0.55686277151108,0.63921570777893); - case 147: return Color3(0.57647061347961,0.52941179275513,0.40392160415649); - case 148: return Color3(0.34117648005486,0.34509804844856,0.34117648005486); - case 149: return Color3(0.086274512112141,0.11372549831867,0.19607844948769); - case 150: return Color3(0.67058825492859,0.678431391716,0.6745098233223); - case 151: return Color3(0.47058826684952,0.56470590829849,0.50980395078659); - case 153: return Color3(0.58431375026703,0.47450983524323,0.46666669845581); - case 154: return Color3(0.48235297203064,0.1803921610117,0.1843137294054); - case 157: return Color3(1,0.96470594406128,0.48235297203064); - case 158: return Color3(0.88235300779343,0.64313727617264,0.7607843875885); - case 168: return Color3(0.4588235616684,0.42352944612503,0.38431376218796); - case 176: return Color3(0.59215688705444,0.41176474094391,0.35686275362968); - case 178: return Color3(0.70588237047195,0.51764708757401,0.33333334326744); - case 179: return Color3(0.53725492954254,0.52941179275513,0.53333336114883); - case 180: return Color3(0.84313732385635,0.66274511814117,0.29411765933037); - case 190: return Color3(0.9764706492424,0.83921575546265,0.1803921610117); - case 191: return Color3(0.90980398654938,0.67058825492859,0.17647059261799); - case 192: return Color3(0.41176474094391,0.25098040699959,0.15686275064945); - case 193: return Color3(0.8117647767067,0.37647062540054,0.14117647707462); - case 195: return Color3(0.27450981736183,0.40392160415649,0.64313727617264); - case 196: return Color3(0.13725490868092,0.27843138575554,0.54509806632996); - case 198: return Color3(0.55686277151108,0.258823543787,0.52156865596771); - case 199: return Color3(0.38823533058167,0.37254902720451,0.38431376218796); - case 200: return Color3(0.50980395078659,0.54117649793625,0.3647058904171); - case 208: return Color3(0.89803928136826,0.89411771297455,0.87450987100601); - case 209: return Color3(0.69019609689713,0.55686277151108,0.26666668057442); - case 210: return Color3(0.43921571969986,0.58431375026703,0.47058826684952); - case 211: return Color3(0.47450983524323,0.70980393886566,0.70980393886566); - case 212: return Color3(0.6235294342041,0.76470595598221,0.91372555494308); - case 213: return Color3(0.42352944612503,0.50588238239288,0.71764707565308); - case 216: return Color3(0.56078433990479,0.29803922772408,0.16470588743687); - case 217: return Color3(0.48627454042435,0.36078432202339,0.27450981736183); - case 218: return Color3(0.58823531866074,0.43921571969986,0.6235294342041); - case 219: return Color3(0.41960787773132,0.38431376218796,0.60784316062927); - case 220: return Color3(0.65490198135376,0.66274511814117,0.80784320831299); - case 221: return Color3(0.80392163991928,0.38431376218796,0.59607845544815); - case 222: return Color3(0.89411771297455,0.678431391716,0.78431379795074); - case 223: return Color3(0.86274516582489,0.56470590829849,0.58431375026703); - case 224: return Color3(0.94117653369904,0.83529418706894,0.62745100259781); - case 225: return Color3(0.9215686917305,0.72156864404678,0.49803924560547); - case 226: return Color3(0.99215692281723,0.91764712333679,0.55294120311737); - case 232: return Color3(0.49019610881805,0.73333334922791,0.8666667342186); - case 268: return Color3(0.2039215862751,0.16862745583057,0.4588235616684); - case 1001: return Color3(0.97254908084869,0.97254908084869,0.97254908084869); - case 1002: return Color3(0.80392163991928,0.80392163991928,0.80392163991928); - case 1003: return Color3(0.066666670143604,0.066666670143604,0.066666670143604); + case 1: return Color3(0.94901967048645F,0.95294123888016,0.95294123888016); + case 2: return Color3(0.63137257099152F,0.64705884456635,0.63529413938522); + case 3: return Color3(0.9764706492424F,0.91372555494308,0.60000002384186); + case 5: return Color3(0.84313732385635F,0.77254909276962,0.60392159223557); + case 6: return Color3(0.7607843875885F,0.85490202903748,0.72156864404678); + case 9: return Color3(0.90980398654938F,0.7294117808342,0.78431379795074); + case 11: return Color3(0.50196081399918F,0.73333334922791,0.85882359743118); + case 12: return Color3(0.79607850313187F,0.51764708757401,0.258823543787); + case 18: return Color3(0.80000007152557F,0.55686277151108,0.41176474094391); + case 21: return Color3(0.76862752437592F,0.15686275064945,0.10980392992496); + case 22: return Color3(0.76862752437592F,0.43921571969986,0.62745100259781); + case 23: return Color3(0.050980396568775F,0.41176474094391,0.6745098233223); + case 24: return Color3(0.96078437566757F,0.80392163991928,0.18823531270027); + case 25: return Color3(0.38431376218796F,0.27843138575554,0.19607844948769); + case 26: return Color3(0.10588236153126F,0.16470588743687,0.20784315466881); + case 27: return Color3(0.42745101451874F,0.43137258291245,0.42352944612503); + case 28: return Color3(0.15686275064945F,0.49803924560547,0.27843138575554); + case 29: return Color3(0.63137257099152F,0.76862752437592,0.54901963472366); + case 36: return Color3(0.95294123888016F,0.8117647767067,0.60784316062927); + case 37: return Color3(0.29411765933037F,0.59215688705444,0.29411765933037); + case 38: return Color3(0.62745100259781F,0.37254902720451,0.20784315466881); + case 39: return Color3(0.75686281919479F,0.79215693473816,0.8705883026123); + case 40: return Color3(0.92549026012421F,0.92549026012421,0.92549026012421); + case 41: return Color3(0.80392163991928F,0.32941177487373,0.29411765933037); + case 42: return Color3(0.75686281919479F,0.87450987100601,0.94117653369904); + case 43: return Color3(0.48235297203064F,0.71372550725937,0.90980398654938); + case 44: return Color3(0.96862751245499F,0.94509810209274,0.55294120311737); + case 45: return Color3(0.70588237047195F,0.82352948188782,0.89411771297455); + case 47: return Color3(0.85098046064377F,0.52156865596771,0.42352944612503); + case 48: return Color3(0.51764708757401F,0.71372550725937,0.55294120311737); + case 49: return Color3(0.97254908084869F,0.94509810209274,0.51764708757401); + case 50: return Color3(0.92549026012421F,0.90980398654938,0.8705883026123); + case 100: return Color3(0.93333339691162F,0.76862752437592,0.71372550725937); + case 101: return Color3(0.85490202903748F,0.52549022436142,0.47843140363693); + case 102: return Color3(0.43137258291245F,0.60000002384186,0.79215693473816); + case 103: return Color3(0.78039222955704F,0.75686281919479,0.71764707565308); + case 104: return Color3(0.41960787773132F,0.19607844948769,0.48627454042435); + case 105: return Color3(0.88627457618713F,0.60784316062927,0.25098040699959); + case 106: return Color3(0.85490202903748F,0.52156865596771,0.2549019753933); + case 107: return Color3(0,0.56078433990479F,0.61176472902298); + case 108: return Color3(0.4078431725502F,0.36078432202339,0.26274511218071); + case 110: return Color3(0.26274511218071F,0.32941177487373,0.57647061347961); + case 111: return Color3(0.74901962280273F,0.71764707565308,0.69411766529083); + case 112: return Color3(0.4078431725502F,0.45490199327469,0.6745098233223); + case 113: return Color3(0.89411771297455F,0.678431391716,0.78431379795074); + case 115: return Color3(0.78039222955704F,0.82352948188782,0.23529413342476); + case 116: return Color3(0.33333334326744F,0.64705884456635,0.68627452850342); + case 118: return Color3(0.71764707565308F,0.84313732385635,0.83529418706894); + case 119: return Color3(0.64313727617264F,0.74117648601532,0.27843138575554); + case 120: return Color3(0.85098046064377F,0.89411771297455,0.65490198135376); + case 121: return Color3(0.90588241815567F,0.6745098233223,0.34509804844856); + case 123: return Color3(0.82745105028152F,0.43529415130615,0.29803922772408); + case 124: return Color3(0.57254904508591F,0.22352942824364,0.47058826684952); + case 125: return Color3(0.91764712333679F,0.72156864404678,0.57254904508591); + case 126: return Color3(0.64705884456635F,0.64705884456635,0.79607850313187); + case 127: return Color3(0.86274516582489F,0.73725491762161,0.50588238239288); + case 128: return Color3(0.68235296010971F,0.47843140363693,0.34901961684227); + case 131: return Color3(0.61176472902298F,0.63921570777893,0.65882354974747); + case 133: return Color3(0.83529418706894F,0.45098042488098,0.23921570181847); + case 134: return Color3(0.84705889225006F,0.8666667342186,0.33725491166115); + case 135: return Color3(0.45490199327469F,0.52549022436142,0.61568629741669); + case 136: return Color3(0.52941179275513F,0.48627454042435,0.56470590829849); + case 137: return Color3(0.87843143939972F,0.59607845544815,0.39215689897537); + case 138: return Color3(0.58431375026703F,0.54117649793625,0.45098042488098); + case 140: return Color3(0.12549020349979F,0.22745099663734,0.33725491166115); + case 141: return Color3(0.15294118225574F,0.27450981736183,0.17647059261799); + case 143: return Color3(0.8117647767067F,0.88627457618713,0.96862751245499); + case 145: return Color3(0.47450983524323F,0.53333336114883,0.63137257099152); + case 146: return Color3(0.58431375026703F,0.55686277151108,0.63921570777893); + case 147: return Color3(0.57647061347961F,0.52941179275513,0.40392160415649); + case 148: return Color3(0.34117648005486F,0.34509804844856,0.34117648005486); + case 149: return Color3(0.086274512112141F,0.11372549831867,0.19607844948769); + case 150: return Color3(0.67058825492859F,0.678431391716,0.6745098233223); + case 151: return Color3(0.47058826684952F,0.56470590829849,0.50980395078659); + case 153: return Color3(0.58431375026703F,0.47450983524323,0.46666669845581); + case 154: return Color3(0.48235297203064F,0.1803921610117,0.1843137294054); + case 157: return Color3(1,0.96470594406128F,0.48235297203064); + case 158: return Color3(0.88235300779343F,0.64313727617264,0.7607843875885); + case 168: return Color3(0.4588235616684F,0.42352944612503,0.38431376218796); + case 176: return Color3(0.59215688705444F,0.41176474094391,0.35686275362968); + case 178: return Color3(0.70588237047195F,0.51764708757401,0.33333334326744); + case 179: return Color3(0.53725492954254F,0.52941179275513,0.53333336114883); + case 180: return Color3(0.84313732385635F,0.66274511814117,0.29411765933037); + case 190: return Color3(0.9764706492424F,0.83921575546265,0.1803921610117); + case 191: return Color3(0.90980398654938F,0.67058825492859,0.17647059261799); + case 192: return Color3(0.41176474094391F,0.25098040699959,0.15686275064945); + case 193: return Color3(0.8117647767067F,0.37647062540054,0.14117647707462); + case 195: return Color3(0.27450981736183F,0.40392160415649,0.64313727617264); + case 196: return Color3(0.13725490868092F,0.27843138575554,0.54509806632996); + case 198: return Color3(0.55686277151108F,0.258823543787,0.52156865596771); + case 199: return Color3(0.38823533058167F,0.37254902720451,0.38431376218796); + case 200: return Color3(0.50980395078659F,0.54117649793625,0.3647058904171); + case 208: return Color3(0.89803928136826F,0.89411771297455,0.87450987100601); + case 209: return Color3(0.69019609689713F,0.55686277151108,0.26666668057442); + case 210: return Color3(0.43921571969986F,0.58431375026703,0.47058826684952); + case 211: return Color3(0.47450983524323F,0.70980393886566,0.70980393886566); + case 212: return Color3(0.6235294342041F,0.76470595598221,0.91372555494308); + case 213: return Color3(0.42352944612503F,0.50588238239288,0.71764707565308); + case 216: return Color3(0.56078433990479F,0.29803922772408,0.16470588743687); + case 217: return Color3(0.48627454042435F,0.36078432202339,0.27450981736183); + case 218: return Color3(0.58823531866074F,0.43921571969986,0.6235294342041); + case 219: return Color3(0.41960787773132F,0.38431376218796,0.60784316062927); + case 220: return Color3(0.65490198135376F,0.66274511814117,0.80784320831299); + case 221: return Color3(0.80392163991928F,0.38431376218796,0.59607845544815); + case 222: return Color3(0.89411771297455F,0.678431391716,0.78431379795074); + case 223: return Color3(0.86274516582489F,0.56470590829849,0.58431375026703); + case 224: return Color3(0.94117653369904F,0.83529418706894,0.62745100259781); + case 225: return Color3(0.9215686917305F,0.72156864404678,0.49803924560547); + case 226: return Color3(0.99215692281723F,0.91764712333679,0.55294120311737); + case 232: return Color3(0.49019610881805F,0.73333334922791,0.8666667342186); + case 268: return Color3(0.2039215862751F,0.16862745583057,0.4588235616684); + case 1001: return Color3(0.97254908084869F,0.97254908084869,0.97254908084869); + case 1002: return Color3(0.80392163991928F,0.80392163991928,0.80392163991928); + case 1003: return Color3(0.066666670143604F,0.066666670143604,0.066666670143604); case 1004: return Color3(1,0,0); - case 1005: return Color3(1,0.68627452850342,0); - case 1006: return Color3(0.70588237047195,0.50196081399918,1); - case 1007: return Color3(0.63921570777893,0.29411765933037,0.29411765933037); - case 1008: return Color3(0.75686281919479,0.74509805440903,0.258823543787); + case 1005: return Color3(1,0.68627452850342F,0); + case 1006: return Color3(0.70588237047195F,0.50196081399918,1); + case 1007: return Color3(0.63921570777893F,0.29411765933037,0.29411765933037); + case 1008: return Color3(0.75686281919479F,0.74509805440903,0.258823543787); case 1009: return Color3(1,1,0); case 1010: return Color3(0,0,1); - case 1011: return Color3(0,0.12549020349979,0.37647062540054); - case 1012: return Color3(0.1294117718935,0.32941177487373,0.72549021244049); - case 1013: return Color3(0.015686275437474,0.68627452850342,0.92549026012421); - case 1014: return Color3(0.66666668653488,0.33333334326744,0); - case 1015: return Color3(0.66666668653488,0,0.66666668653488); - case 1016: return Color3(1,0.40000003576279,0.80000007152557); - case 1017: return Color3(1,0.68627452850342,0); - case 1018: return Color3(0.070588238537312,0.93333339691162,0.83137261867523); + case 1011: return Color3(0,0.12549020349979F,0.37647062540054); + case 1012: return Color3(0.1294117718935F,0.32941177487373,0.72549021244049); + case 1013: return Color3(0.015686275437474F,0.68627452850342,0.92549026012421); + case 1014: return Color3(0.66666668653488F,0.33333334326744,0); + case 1015: return Color3(0.66666668653488F,0,0.66666668653488); + case 1016: return Color3(1,0.40000003576279F,0.80000007152557); + case 1017: return Color3(1,0.68627452850342F,0); + case 1018: return Color3(0.070588238537312F,0.93333339691162,0.83137261867523); case 1019: return Color3(0,1,1); case 1020: return Color3(0,1,0); - case 1021: return Color3(0.22745099663734,0.49019610881805,0.082352943718433); - case 1022: return Color3(0.49803924560547,0.55686277151108,0.39215689897537); - case 1023: return Color3(0.54901963472366,0.35686275362968,0.6235294342041); - case 1024: return Color3(0.68627452850342,0.8666667342186,1); - case 1025: return Color3(1,0.78823536634445,0.78823536634445); - case 1026: return Color3(0.69411766529083,0.65490198135376,1); - case 1027: return Color3(0.6235294342041,0.95294123888016,0.91372555494308); - case 1028: return Color3(0.80000007152557,1,0.80000007152557); - case 1029: return Color3(1,1,0.80000007152557); - case 1030: return Color3(1,0.80000007152557,0.60000002384186); - case 1031: return Color3(0.38431376218796,0.14509804546833,0.81960791349411); - case 1032: return Color3(1,0,0.74901962280273); + case 1021: return Color3(0.22745099663734F,0.49019610881805,0.082352943718433); + case 1022: return Color3(0.49803924560547F,0.55686277151108,0.39215689897537); + case 1023: return Color3(0.54901963472366F,0.35686275362968,0.6235294342041); + case 1024: return Color3(0.68627452850342F,0.8666667342186,1); + case 1025: return Color3(1,0.78823536634445F,0.78823536634445); + case 1026: return Color3(0.69411766529083F,0.65490198135376,1); + case 1027: return Color3(0.6235294342041F,0.95294123888016,0.91372555494308); + case 1028: return Color3(0.80000007152557F,1,0.80000007152557); + case 1029: return Color3(1,1,0.80000007152557F); + case 1030: return Color3(1,0.80000007152557F,0.60000002384186F); + case 1031: return Color3(0.38431376218796F,0.14509804546833F,0.81960791349411F); + case 1032: return Color3(1,0,0.74901962280273F); default: return Color3::gray(); } } diff --git a/GroupInstance.cpp b/GroupInstance.cpp index c8c593b..cd5f5a4 100644 --- a/GroupInstance.cpp +++ b/GroupInstance.cpp @@ -4,11 +4,13 @@ GroupInstance::GroupInstance(void) { PVInstance::PVInstance(); className = "GroupInstance"; + listicon = 12; } GroupInstance::GroupInstance(const GroupInstance &oinst) { PVInstance::PVInstance(oinst); + listicon = 12; } GroupInstance::~GroupInstance(void) diff --git a/Instance.cpp b/Instance.cpp index 1c14884..7893acf 100644 --- a/Instance.cpp +++ b/Instance.cpp @@ -8,7 +8,7 @@ Instance::Instance(void) parent = NULL; name = "Default Game Instance"; className = "BaseInstance"; - listicon = 0; + listicon = 1; canDelete = true; } diff --git a/PVInstance.cpp b/PVInstance.cpp index 1a0da08..206de12 100644 --- a/PVInstance.cpp +++ b/PVInstance.cpp @@ -5,6 +5,7 @@ PVInstance::PVInstance(void) Instance::Instance(); nameShown = false; className = "PVInstance"; + listicon = 0; } PVInstance::PVInstance(const PVInstance &oinst) diff --git a/Parts.bmp b/Parts.bmp index bab00c9950b4c775aef7e0678d0428c42c3c72bb..2aaa8bfd442c3c9e823346fce5c36bf96d1adec0 100644 GIT binary patch delta 1212 zcma)6Ur1AN6!t3KdG+Sa&FOR(O&hy9y=$S4>HI?r#WbCba5X1e4a0{5mGGg5@S&GN z)A>PBN%|ayf+SH{i(Yy&tR4!@K@U+F-5v{JoqOj35yT6>ANSAsedjyh`OaNlW0nIJ zPnT0p(=I3N6|@vuhiNfsCfeze@%w}kN`^D4^kdU1V2Ej>l?f%H*PfL~3rYuAi0LuB zWz_Fx`o^Q{5QkNYQ6d7?GjCBWj~Hjef~y3dbvN)lSHP95Kk4gf7&aG7yY=YFc4E@U zYS9}84k3e#)46v{i9~{k?A2JQ3LCnub!z{cjl^ z^@pjDQrp)5Yi7Q723nXX0(&}kM;?bl9iBTr|-?T+iH?{9~lEIHB2C6AkNxlzJc zIY(~ikviUTR>qe1fFq+?a;&LL8;9_jMg)BUwPy76SrDqVQI9wb4OVKrV(od;y&|?~ zELBI|?@bP{?B7OPVU0Ew3d_TO-b7QOhl?Om{)jUUsN+l!mUB+i`BNB^nm~0WIm(X#fBK literal 26934 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 a_0W=u#~wOjTfUq72-e~}zqYS0Uh==yGMoDV diff --git a/PropertyWindow.cpp b/PropertyWindow.cpp index 023bb5a..bb0f3ce 100644 --- a/PropertyWindow.cpp +++ b/PropertyWindow.cpp @@ -141,11 +141,11 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; SelectObject(hdc, hbmMask); - BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1, + BitBlt(lpdis->hDC, x, lpdis->rcItem.top, CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCAND); SelectObject(hdc, hbmIcon); - BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1, + BitBlt(lpdis->hDC, x, lpdis->rcItem.top, CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCPAINT); DeleteDC(hdc); diff --git a/WorkspaceInstance.cpp b/WorkspaceInstance.cpp index f7254b6..47fceec 100644 --- a/WorkspaceInstance.cpp +++ b/WorkspaceInstance.cpp @@ -7,7 +7,6 @@ WorkspaceInstance::WorkspaceInstance(void) name = "Workspace"; className = "Workspace"; canDelete = false; - listicon = 8; } WorkspaceInstance::~WorkspaceInstance(void) diff --git a/main.cpp b/main.cpp index 1fd4dfe..ae8ca8a 100644 --- a/main.cpp +++ b/main.cpp @@ -926,20 +926,20 @@ BOOL GetKPBool(int VK) { void Demo::onUserInput(UserInput* ui) { - /* - if(GetHoldKeyState(VK_LCONTROL)) + + /*if(GetHoldKeyState(VK_LCONTROL)) { if(GetHoldKeyState('D')) { messageTime = System::time(); - if(debugMode()) + if() message = "Debug Mode Disabled"; else message = "Debug Mode Enabled"; setDebugMode(!debugMode()); } - } - */ + }*/ + if(GetHoldKeyState(VK_F8)) { messageTime = System::time(); @@ -1789,6 +1789,7 @@ int main(int argc, char** argv) { } catch(...) { + //TODO Figure how to save the error to file OnError(-1); } return 0;